defect #4026, allow for SN facing ip to be seen

ESXi releases updates without bumping version numbers.  For such cases,
the default behavior is for the new version to supersede the old.  This
makes sense for the vast majority of cases.  There are, however, corner
cases where being explicit about the release is indicated.

README

@@ -1,14 +0,0 @@
-xCAT - eXtreme Cloud Administration Toolkit
-
-xCAT is a toolkit for the deployment and administration of clusters.
-
-xCAT documentation is available at: http://xcat.sourceforge.net/
-
-xCAT is made available as open source software under the EPL license:
-http://www.opensource.org/licenses/eclipse-1.0.php
-
-
-
-
-
-

Version

@@ -1 +1 @@
-2.9
+2.8.4

build-debs-all

@@ -0,0 +1,88 @@
+#!/bin/bash
+###########
+#
+# This script call make<package>deb and create the deb packages
+# for xCAT
+#
+# Author: Leonardo Tonetto <tonetto@linux.vnet.ibm.com>
+# Revisor: Adalberto Medeiros <adalbas@linux.vnet.ibm.com>
+# Revisor2: Arif Ali <aali@ocf.co.uk>
+#
+# Input:
+#
+# $1 is the build type/location
+# $2 is the string added to the debian/changelog of each package
+# 
+############
+
+##############
+# Get input
+##############
+
+PKG_LOCATION=$1                       # local | snap | alpha
+if [ -z $PKG_LOCATION ]; then
+	PKG_LOCATION="local"
+fi
+BUILD_STRING=$2
+if [ -z $BUILD_STRING ]; then
+	BUILD_STRING="Personal Build"
+fi
+XCAT_VERSION=`cat Version`
+TRUNK_REVISION=`svnversion | cut -d ":" -f1`
+CUR_DATE=`date +%Y%m%d`
+VERSION="${XCAT_VERSION}-${PKG_LOCATION}${CUR_DATE}"
+
+function makedeb {
+	SRC_ROOT=$1
+	PKG_LOCATION=$2
+	BUILD_STRING=$3
+	VERSION=$4
+
+	#
+	# Make DEBs
+	#
+	# build perl-xCAT - deps are libsoap-lite-perl, libdigest-sha1-perl, libdbi-perl
+	#
+
+	find $SRC_ROOT -maxdepth 2 -name debian -type d | while read DEBIAN_DIR
+	do
+        	DIR=`echo ${DEBIAN_DIR} | sed -e 's/[/]debian$//'`
+        	cd ${DIR}
+		dch -v $VERSION -b -c debian/changelog "$BUILD_STRING"
+        	dpkg-buildpackage
+		cd -
+        	RC=$?
+        	if [ ${RC} -gt 0 ]
+        	then
+                	echo "Warning: ${DEBIAN_DIR} failed exit code ${RC}"
+        	fi
+	done
+
+	#	
+	# Clean up
+	#
+	# Eliminate unnecessary directories and debian/files made by dpkg-buildpackage
+
+	find $SRC_ROOT -maxdepth 3 -type d -name "xcat-*" | grep debian | xargs rm -rf	
+	find $SRC_ROOT -maxdepth 3 -type f -name "files" | grep debian | xargs rm -f
+}
+
+# build all debian packages
+packages="xCAT-client xCAT-nbroot xCAT-nbroot2 perl-xCAT xCAT-server xCAT-UI xCAT xCATsn xCAT-test xCAT-IBMhpc xCAT-rmc"
+
+for file in `echo $packages`
+do
+    makedeb $file $PKG_LOCATION "$BUILD_STRING" $VERSION
+done
+
+if [ -d debs ]; then
+	rm -rf debs
+fi
+
+mkdir debs
+mv xcat* debs/
+mv perl-xcat* debs/
+
+echo $VERSION > latest_version
+
+exit 0

builddep.sh

@@ -138,21 +138,8 @@ if [ "$PERLVER" == "v5.8.2" ]; then
         OSVER='5.3'
 elif [ "$PERLVER" == "v5.8.8" ]; then
         OSVER='6.1'
-        aixver=`lslpp -lc|grep 'bos.rte:'|head -1|cut -d: -f3`
-                if [[ $aixver < '6.1.9.0' ]]; then
-                        AIX61Y=0
-                else
-                        AIX61Y=1
-                fi
 elif [ "$PERLVER" == "v5.10.1" ]; then
         OSVER='7.1'
-        aixver=`lslpp -lc|grep 'bos.rte:'|head -1|cut -d: -f3`
-		if [[ $aixver < '7.1.3.0' ]]; then
-			AIX71L=0
-		else
-			AIX71L=1
-		fi
-
 else
         echo "Error: the perl version of '$PERLVER' is not one that instoss understands.  Exiting..."
         exit 2
@@ -169,30 +156,33 @@ echo "Running updtvpkg. This could take a few minutes."
 /usr/sbin/updtvpkg
 echo "updtvpkg has completed."
 
-# unixODBC is required by pyodbc, so install it first
 rpm -Uvh unixODBC*
-# Now install the bulk of the rpms, one at a time, in case some are already installed
-for i in `ls *.rpm|grep -v -E '^tcl-|^tk-|^expect-|^unixODBC-|^xCAT-UI-deps|^perl-DBD-DB2Lite|^net-snmp'`; do
+for i in `ls *.rpm|grep -v -E '^tcl-|^tk-|^expect-|^unixODBC-|^xCAT-UI-deps|^perl-DBD-DB2Lite'`; do
 	if [ "$i" == "perl-Net-DNS-0.66-1.aix5.3.ppc.rpm" ]; then
 		opts="--nodeps"
 	else
 		opts=""
 	fi
-
-	# On 7.1L and 6.1Y we need a newer version of perl-Net_SSLeay.pm
-	if [[ $AIX71L -eq 1 || $AIX61Y -eq 1 ]]; then
-		if [[ $i == perl-Net_SSLeay.pm-1.30-* ]]; then continue; fi 	# skip the old rpm
-	else
-		if [[ $i == perl-Net_SSLeay.pm-1.55-* ]]; then continue; fi 	# skip the new rpm
-	fi
+	
+	# just in case we need it sometime, this next if stmt would mean: if it does not start with perl-DBD-DB2
+	#if [ "${i#perl-DBD-DB2}" == "$i" ]; then
 	
 	echo rpm -Uvh $opts $i
 	rpm -Uvh $opts $i
 done
-# Have to upgrade all of the net-snmp rpms together because they depend on each other.
-# Also, they require bash, so do it after the loop, rather than before
-rpm -Uvh net-snmp*
-
+# don't try to install tcl, tk, or expect if they are already installed!
+# this section about expect/tcl/tk can be removed once 2.8 releases, because 2.8 no longer requires expect
+lslpp -l | grep expect.base > /dev/null 2>&1
+if [ $? -gt 0 ]; then
+	if [ "$OSVER" == "5.3" ]; then
+		for i in tcl-*.rpm tk-*.rpm expect-*.rpm; do
+			echo rpm -Uvh $i
+			rpm -Uvh $i
+		done
+	else
+		echo "The expect.base, tcl.base, and tk.base filesets must also be installed before installing the xCAT RPMs from xcat-core."
+	fi
+fi
 EOF
 # end of instoss file content ---------------------------------------------
 
@@ -206,7 +196,7 @@ if [ "$OSNAME" == "AIX" ]; then
 else
 	SYSGRP=root
 fi
-chgrp -R -h $SYSGRP *
+chgrp -R $SYSGRP *
 chmod -R g+w *
 
 # Build the tarball

makerpm

@@ -53,6 +53,7 @@ function makexcat {
 			tar -X /tmp/xcat-excludes -cf $RPMROOT/SOURCES/templates.tar templates
 			gzip -f $RPMROOT/SOURCES/templates.tar
 			cp xcat.conf $RPMROOT/SOURCES
+			cp xcat.conf.apach24 $RPMROOT/SOURCES
 			cp xCATMN $RPMROOT/SOURCES
 		else	# xCATsn
 			tar -X /tmp/xcat-excludes -cf $RPMROOT/SOURCES/license.tar LICENSE.html

perl-xCAT/db2man

@@ -262,6 +262,12 @@ expression B<($1-1)%14+1> will evaluate to B<6>.
 
 See http://www.perl.com/doc/manual/html/pod/perlre.html for information on perl regular expressions.
 
+=head2 Easy Regular Expressions 
+
+As of xCAT 2.8.1, you can use a modified version of the regular expression support described in the previous section. You do not need to enter the node information (1st part of the expression), it will be derived from the input nodename. You only need to supply the 2nd part of the expression to determine the value to give the attribute. For examples, see 
+
+https://sourceforge.net/apps/mediawiki/xcat/index.php?title=Listing_and_Modifying_the_Database#Easy_Regular_expressions
+
 =head1 OBJECT DEFINITIONS
 
 Because it can get confusing what attributes need to go in what tables, the xCAT database can also

perl-xCAT/modifyUtils

@@ -1,20 +1,21 @@
 #!/bin/sh
 # Put the version, svn revision #, and build date into the Version function in Version.pm
 
-if [ -z "$1" ]
+if [ -z "$2" ]
 	then
 	echo "modifyUtils:  Error:  must specify the xCAT version as an argument" >&2
 	exit
 fi
 
 VER=$1
+GITREF="git commit $2, "
 
 BUILDDATE=`date`
 #echo ". '(built $BUILDDATE)'"
 
 if [ "$(uname)" = "AIX" ]
 then
-	sed -e s/"#XCATVERSIONSUBHERE"/". '$VER'"/ -e s/"#XCATSVNBUILDSUBHERE"/". ' (built $BUILDDATE)'"/ xCAT/Version.pm >xCAT/Version.pm.new
+	sed -e s/"#XCATVERSIONSUBHERE"/". '$VER'"/ -e s/"#XCATSVNBUILDSUBHERE"/". ' (${GITREF}built $BUILDDATE)'"/ xCAT/Version.pm >xCAT/Version.pm.new
 	mv xCAT/Version.pm.new xCAT/Version.pm
 else
         if [ -f "/etc/debian_version" ];then
@@ -22,5 +23,5 @@ else
         else
             FILENAME="xCAT/Version.pm"
         fi
-	sed -i -e s/"#XCATVERSIONSUBHERE"/". '$VER'"/ -e s/"#XCATSVNBUILDSUBHERE"/". ' (built $BUILDDATE)'"/ $FILENAME
+	sed -i -e s/"#XCATVERSIONSUBHERE"/". '$VER'"/ -e s/"#XCATSVNBUILDSUBHERE"/". ' (${GITREF}built $BUILDDATE)'"/ $FILENAME
 fi

perl-xCAT/perl-xCAT.spec

@@ -23,6 +23,8 @@ Provides: perl-xCAT = %{epoch}:%{version}
 Provides perl xCAT libraries for core functionality.  Required for all xCAT installations.
 Includes xCAT::Table, xCAT::NodeRange, among others.
 
+%define gitinfo %(git log -n 1 | head -n 1 | cut -f 2 -d ' ')
+
 %define zvm %(if [ "$zvm" = "1" ];then echo 1; else echo 0; fi)
 %define fsm %(if [ "$fsm" = "1" ];then echo 1; else echo 0; fi)
 
@@ -36,7 +38,7 @@ Includes xCAT::Table, xCAT::NodeRange, among others.
 %if %fsm
 %else
 # Modify the Version() function in xCAT/Utils.pm to automatically have the correct version
-./modifyUtils %{version}
+./modifyUtils %{version} %{gitinfo}
 
 # Build the pod version of the man pages for each DB table.  It puts them in the man5 and man7 subdirs.
 # Then convert the pods to man pages and html pages.

perl-xCAT/xCAT/Client.pm

@@ -8,11 +8,9 @@ BEGIN
 
 # if AIX - make sure we include perl 5.8.2 in INC path.
 #       Needed to find perl dependencies shipped in deps tarball.
-use Storable qw/nstore_fd fd_retrieve/;
 if ($^O =~ /^aix/i) {
 	unshift(@INC, qw(/usr/opt/perl5/lib/5.8.2/aix-thread-multi /usr/opt/perl5/lib/5.8.2 /usr/opt/perl5/lib/site_perl/5.8.2/aix-thread-multi /usr/opt/perl5/lib/site_perl/5.8.2));
 }
-use IO::Handle;
 
 my $inet6support;
 if ($^O =~ /^aix/i) {  # disable AIX IPV6  TODO fix
@@ -79,23 +77,6 @@ sub rspclean {
 	}
 	return 0;
 }
-sub send_request {
-    my $request = shift;
-    my $sock = shift;
-    my $encode = shift;
-    if ($encode eq "xml") {
-        my $msg=XMLout($request,RootName=>'xcatrequest',NoAttr=>1,KeyAttr=>[]);
-        if ($ENV{XCATXMLTRACE}) { print $msg; }
-        if($ENV{XCATXMLWARNING}) {
-            validateXML($msg);
-        }
-        print $sock $msg;
-        $sock->flush();
-    } else {
-        nstore_fd($request,$sock);
-        $sock->flush();
-    }
-}
 #################################
 # submit_request will take an xCAT command and pass it to the xCAT
 #   server for execution.
@@ -262,26 +243,20 @@ if (ref($request) eq 'HASH') { # the request is an array, not pure XML
   }
 
   my $msg;
-  my $encode = "xml";
-  #storable encoding is unsafe, carry on with the unsafe xml scheme
-  #perhaps one day will support faster schemes
-  #my $encode = "storable";
-  #my $straightprint=0;
-  #if ($ENV{XCATXMLTRACE} or $ENV{XCATXMLWARNING}) { $encode="xml"; }
   if (ref($request) eq 'HASH') { # the request is an array, not pure XML
-    #print $client "xcatencoding: $encode\n";
-    #my $encok=<$client>;
-    send_request($request,$client,$encode);
+    $msg=XMLout($request,RootName=>'xcatrequest',NoAttr=>1,KeyAttr=>[]);
   } else { #XML
-    $straightprint=1;
     $msg=$request;
-    print $client $msg;
   }
-  $SIG{TERM} =  $SIG{INT} = sub { send_request({abortcommand=>[1]},$client,$encode); exit 0; };
+  if ($ENV{XCATXMLTRACE}) { print $msg; }
+  if($ENV{XCATXMLWARNING}) {
+    validateXML($msg);
+  }
+  $SIG{TERM} =  $SIG{INT} = sub { print $client XMLout({abortcommand=>1},RootName=>'xcatrequest',NoAttr=>1,KeyAttr=>[]); exit 0; };
+  print $client $msg;
   my $response;
   my $rsp;
   my $cleanexit=0;
-  if ($encode eq 'xml') {
   my $massresponse="<massresponse>";
   my $nextcoalescetime=time()+1;
   my $coalescenow=0;
@@ -335,27 +310,6 @@ if (ref($request) eq 'HASH') { # the request is an array, not pure XML
 	$massresponse .= "</massresponse>";
          $cleanexit = rspclean($massresponse,$callback);
   }
-  } else { #storable encode
-    my $rsp;
-    eval { $rsp = fd_retrieve($client); };
-    SERVERINPUT: while ($rsp) {
-     my @rsps;
-     if (ref $rsp eq 'ARRAY') {
-        @rsps = @$rsp;
-     } else {
-        @rsps = ($rsp);
-    }
-    foreach (@rsps) {
-     $callback->($_);
-     if ($_->{serverdone}) {
-         $cleanexit=1;
-         last SERVERINPUT;
-      }
-     }
-     $rsp = undef;
-     eval { $rsp = fd_retrieve($client); };
-    }
-  }
   $massresponse="";
   unless ($cleanexit) {
      print STDERR "ERROR/WARNING: communication with the xCAT server seems to have been ended prematurely\n";
@@ -1159,12 +1113,7 @@ sub handle_response {
 #print "printing node\n";
     my $node;
     foreach $node (@$nodes) {
-      my $desc;
-      if (ref($node->{name}) eq 'ARRAY') {
-      $desc=$node->{name}->[0];
-      } else {
-      $desc=$node->{name};
-      }
+      my $desc=$node->{name}->[0];
       if ($node->{errorcode}) {
         if (ref($node->{errorcode}) eq 'ARRAY') {
           foreach my $ecode (@{$node->{errorcode}}) {
@@ -1184,24 +1133,7 @@ sub handle_response {
 		 $errflg=1;
       }
       if ($node->{data}) {
-         if (ref(\($node->{data})) eq 'SCALAR') {
-            $desc=$desc.": ".$node->{data};
-         } elsif (ref($node->{data}) eq 'HASH') {
-            if ($node->{data}->{desc}) {
-             if (ref($node->{data}->{desc}) eq 'ARRAY') {
-              $desc=$desc.": ".$node->{data}->{desc}->[0];
-              } else {
-              $desc=$desc.": ".$node->{data}->{desc};
-              }
-            }
-            if ($node->{data}->{contents}) {
-                if (ref($node->{data}->{contents}) eq 'ARRAY') {
-        $desc="$desc: ".$node->{data}->{contents}->[0];
-                } else {
-        $desc="$desc: ".$node->{data}->{contents};
-                }
-            }
-         } elsif (ref(\($node->{data}->[0])) eq 'SCALAR') {
+         if (ref(\($node->{data}->[0])) eq 'SCALAR') {
             $desc=$desc.": ".$node->{data}->[0];
          } else {
             if ($node->{data}->[0]->{desc}) {

perl-xCAT/xCAT/FSPvitals.pm

@@ -435,7 +435,7 @@ sub lcds {
     if( $type eq "lpar" ) {
         $action = "query_lcds";
     } elsif ($type eq "blade") {
-        $action = "pblade_query_lcds";  
+        $action = "pblade_query_lcds";
     } else {
         $action = "cec_query_lcds";
     } 

perl-xCAT/xCAT/InstUtils.pm

@@ -1135,8 +1135,8 @@ sub dolitesetup
 
 		if (!$file) {
 			next;
-		}
-        
+       	}
+
         # ex. .../inst_root/foo/bar/  or .../inst_root/etc/lppcfg
         my $instrootfile = $instrootloc . $file;
 

perl-xCAT/xCAT/NetworkUtils.pm

@@ -2195,6 +2195,7 @@ sub isValidHostname
     return 0;
 }
 
+
 #-------------------------------------------------------------------------------
 
 =head3 isValidFQDN

perl-xCAT/xCAT/ProfiledNodeUtils.pm

@@ -719,28 +719,6 @@ sub get_nodes_profiles
     return \%profile_dict;
 }
 
-#-------------------------------------------------------------------------------
-
-=head3 get_imageprofile_prov_osvers
-      Description : Get A node's provisioning os version and profile from its imageprofile attribute.
-      Arguments   : $imgprofilename - imageprofile name
-      Returns     : node's osversion and profile
-=cut
-
-#-------------------------------------------------------------------------------
-sub get_imageprofile_prov_osvers
-{
-
-    my $class = shift;
-    my $imgprofilename = shift;
-    my $osimgtab = xCAT::Table->new('osimage');
-    my $osimgentry = ($osimgtab->getAllAttribsWhere("imagename = '$imgprofilename'", 'ALL' ))[0];
-    my $osversion = $osimgentry->{'osvers'};
-    my $profile = $osimgentry->{'profile'};
-    return ($osversion, $profile);
-}
-
-
 #-------------------------------------------------------------------------------
 
 =head3 get_imageprofile_prov_method
@@ -770,6 +748,27 @@ sub get_imageprofile_prov_method
 
 #-------------------------------------------------------------------------------
 
+=head3 get_imageprofile_prov_osvers
+      Description : Get A node's provisioning os version and profile from its imageprofile attribute.
+      Arguments   : $imgprofilename - imageprofile name
+      Returns     : node's osversion and profile
+=cut
+
+#-------------------------------------------------------------------------------
+sub get_imageprofile_prov_osvers
+{
+
+    my $class = shift;
+    my $imgprofilename = shift;
+    my $osimgtab = xCAT::Table->new('osimage');
+    my $osimgentry = ($osimgtab->getAllAttribsWhere("imagename = '$imgprofilename'", 'ALL' ))[0];
+    my $osversion = $osimgentry->{'osvers'};
+    my $profile = $osimgentry->{'profile'};
+    return ($osversion, $profile);
+}
+
+#-------------------------------------------------------------------------------
+
 =head3 check_profile_consistent
       Description : Check if three profile consistent
       Arguments   : $imageprofile - image profile name

perl-xCAT/xCAT/Schema.pm

@@ -267,14 +267,11 @@ virtsd => {
 },
 
 storage => {
-    cols => [qw(node osvolume size state storagepool hypervisor fcprange volumetag type controller comments disable)],
+    cols => [qw(node osvolume size state storagepool hypervisor fcprange volumetag comments disable)],
     keys => [qw(node)],
     table_descr => 'Node storage resources',
     descriptions => {
         node => 'The node name',
-        controller => 'The management address to attach/detach new volumes.
-                       In the scenario involving multiple controllers, this data must be
-                       passed as argument rather than by table value',
         osvolume => "Specification of what storage to place the node OS image onto.  Examples include:
                 localdisk (Install to first non-FC attached disk)
                 usbdisk (Install to first USB mass storage device seen)
@@ -284,7 +281,6 @@ storage => {
         storagepool => 'Name of storage pool where the volume is assigned.',
         hypervisor => 'Name of the hypervisor where the volume is configured.',
         fcprange => 'A range of acceptable fibre channels that the volume can use. Examples include: 3B00-3C00;4B00-4C00.',
-        type => 'The plugin used to drive storage configuration (e.g. svc)',
         volumetag => 'A specific tag used to identify the volume in the autoyast or kickstart template.',
         comments => 'Any user-written notes.',
         disable => "Set to 'yes' or '1' to comment out this row.",
@@ -536,7 +532,7 @@ nodegroup => {
  },
   },
 nodehm => {
-    cols => [qw(node power mgt cons termserver termport conserver serialport serialspeed serialflow getmac cmdmapping consoleondemand comments disable)],
+    cols => [qw(node power mgt cons termserver termport conserver serialport serialspeed serialflow getmac cmdmapping comments disable)],
     keys => [qw(node)],
     tablespace =>'XCATTBS16K',
     table_desc => "Settings that control how each node's hardware is managed.  Typically, an additional table that is specific to the hardware type of the node contains additional info.  E.g. the ipmi, mp, and ppc tables.",
@@ -553,7 +549,6 @@ nodehm => {
   serialflow => "The flow control value of the serial port for this node.  For SOL this is typically 'hard'.",
   getmac => 'The method to use to get MAC address of the node with the getmac command. If not set, the mgt attribute will be used.  Valid values: same as values for mgmt attribute.',
   cmdmapping => 'The fully qualified name of the file that stores the mapping between PCM hardware management commands and xCAT/third-party hardware management commands for a particular type of hardware device.  Only used by PCM.',
-  consoleondemand => 'This overrides the value from site.consoleondemand; (0=no, 1=yes). Default is the result from site.consoleondemand.',
      comments => 'Any user-written notes.',
      disable => "Set to 'yes' or '1' to comment out this row.",
  },
@@ -572,7 +567,7 @@ nodelist => {
      appstatustime =>'The date and time when appstatus was updated.',
      primarysn => 'Not used currently. The primary servicenode, used by this node.',
      hidden => "Used to hide fsp and bpa definitions, 1 means not show them when running lsdef and nodels",
-     updatestatus => "The current node update status. Valid states are synced, out-of-sync,syncing,failed.",
+     updatestatus => "The current node update status. Valid states are synced out-of-sync,syncing,failed.",
      updatestatustime => "The date and time when the updatestatus was updated.",
      zonename => "The name of the zone to which the node is currently assigned. If undefined, then it is not assigned to any zone. ",
      comments => 'Any user-written notes.',
@@ -604,7 +599,7 @@ noderes => {
  descriptions => {
   node => 'The node name or group name.',
   servicenode => 'A comma separated list of node names (as known by the management node) that provides most services for this node. The first service node on the list that is accessible will be used.  The 2nd node on the list is generally considered to be the backup service node for this node when running commands like snmove.',
-  netboot => 'The type of network booting to use for this node.  Valid values:  pxe or xnba for x86* architecture, yaboot for POWER architecture.',
+  netboot => 'The type of network booting to use for this node.  Valid values:  pxe or xnba for x86* architecture, yaboot for POWER architecture, grub2 for RHEL7 on Power. Notice: yaboot is not supported from rhels7 on Power,use grub2 instead',
   tftpserver => 'The TFTP server for this node (as known by this node). If not set, it defaults to networks.tftpserver.',
   tftpdir => 'The directory that roots this nodes contents from a tftp and related perspective.  Used for NAS offload by using different mountpoints.',
   nfsserver => 'The NFS or HTTP server for this node (as known by this node).',
@@ -770,11 +765,11 @@ passwd => {
 policy => {
     cols => [qw(priority name host commands noderange parameters time rule comments disable)],
     keys => [qw(priority)],
-    table_desc => 'The policy table in the xCAT database controls who has authority to run specific xCAT operations. It is basically the Access Control List (ACL) for xCAT. It is sorted on the priority field before evaluating.',
+    table_desc => 'The policy table in the xCAT database controls who has authority to run specific xCAT operations. It is basically the Access Control List (ACL) for xCAT.',
  descriptions => {
-  priority => 'The priority value for this rule.  This value is used to identify this policy data object (i.e. this rule) The table is sorted on this field with the lower the number the higher the priority. For example 1.0 is higher priority than 4.1 is higher than 4.9.',
+  priority => 'The priority value for this rule.  This value is used to identify this policy data object (i.e. this rule).',
   name => 'The username that is allowed to perform the commands specified by this rule.  Default is "*" (all users).',
-  host => 'The host from which users may issue the commands specified by this rule.  Default is "*" (all hosts). Only all or one host is supported',
+  host => 'The host from which users may issue the commands specified by this rule.  Default is "*" (all hosts). Only all or one host supported. ',
   commands => 'The list of commands that this rule applies to.  Default is "*" (all commands).',
   noderange => 'The Noderange that this rule applies to.  Default is "*" (all nodes). Not supported with the *def commands.',
   parameters => 'A regular expression that matches the command parameters (everything except the noderange) that this rule applies to.  Default is "*" (all parameters). Not supported with the *def commands.',
@@ -788,11 +783,11 @@ postscripts => {
     cols => [qw(node postscripts postbootscripts comments disable)],
     keys => [qw(node)],
     tablespace =>'XCATTBS16K',
-    table_desc => 'The scripts that should be run on each node after installation or diskless boot.',
+    table_desc => ' The scripts that should be run on each node after installation or diskless boot.',
  descriptions => {
   node => 'The node name or group name.',
   postscripts => 'Comma separated list of scripts that should be run on this node after diskfull installation or diskless boot. Each script can take zero or more parameters. For example: "script1 p1 p2,script2,...". xCAT automatically adds the postscripts from  the xcatdefaults.postscripts attribute of the table to run first on the nodes after install or diskless boot. For installation of RedHat, CentOS, Fedora, the scripts will be run before the reboot. For installation of SLES, the scripts will be run after the reboot but before the init.d process. For diskless deployment, the scripts will be run at the init.d time, and xCAT will automatically add the list of scripts from the postbootscripts attribute to run after postscripts list. For installation of AIX, the scripts will run after the reboot and acts the same as the postbootscripts attribute.  For AIX, use the postbootscripts attribute. Support will be added in the future for  the postscripts attribute to run the scripts before the reboot in AIX. ',
-  postbootscripts => 'Comma separated list of scripts that should be run on this node after diskfull installation or diskless boot. Each script can take zero or more parameters. For example: "script1 p1 p2,script2,...". On AIX these scripts are run during the processing of /etc/inittab.  On Linux they are run at the init.d time. xCAT automatically adds the scripts in the xcatdefaults.postbootscripts attribute to run first in the list.',
+  postbootscripts => 'Comma separated list of scripts that should be run on thisnode after diskfull installation or diskless boot. Each script can take zero or more parameters. For example: "script1 p1 p2,script2,...". On AIX these scripts are run during the processing of /etc/inittab.  On Linux they are run at the init.d time. xCAT automatically adds the scripts in the xcatdefaults.postbootscripts attri bute to run first in the list.',
     comments => 'Any user-written notes.',
      disable => "Set to 'yes' or '1' to comment out this row.",
  },
@@ -1557,7 +1552,7 @@ mic => {
 hwinv => {
     cols => [qw(node cputype cpucount memory disksize comments disable)],
     keys => [qw(node)],
-    table_desc => 'The hareware inventory for the node.',
+    table_desc => 'The hardware inventory for the node.',
     descriptions => {
         node => 'The node name or group name.',
         cputype => 'The cpu model name for the node.',
@@ -1568,7 +1563,6 @@ hwinv => {
         disable =>  "Set to 'yes' or '1' to comment out this row.",
     },
 },
-
 ); # end of tabspec definition
 
 
@@ -1912,10 +1906,6 @@ my @nodeattrs = (
         {attr_name => 'serialflow',
                  tabentry => 'nodehm.serialflow',
                  access_tabentry => 'nodehm.node=attr:node',
-  },
-        {attr_name => 'consoleondemand',
-                 tabentry => 'nodehm.consoleondemand',
-                 access_tabentry => 'nodehm.node=attr:node',
   },
 ##################
 #  vpd table     #
@@ -2334,14 +2324,6 @@ my @nodeattrs = (
                  tabentry => 'storage.osvolume',
                  access_tabentry => 'storage.node=attr:node',
                 },
-                {attr_name => 'storagcontroller',
-                 tabentry => 'storage.controller',
-                 access_tabentry => 'storage.node=attr:node',
-                },
-                {attr_name => 'storagetype',
-                 tabentry => 'storage.type',
-                 access_tabentry => 'storage.node=attr:node',
-                },
 ######################
 #  vm table          #
 ######################
@@ -2583,7 +2565,7 @@ my @nodeattrs = (
 		tabentry => 'hwinv.disksize',
 		access_tabentry => 'hwinv.node=attr:node',
 	},
-		
+	
   );	# end of @nodeattrs that applies to both nodes and groups
 
 
@@ -2633,11 +2615,11 @@ my @nodeattrs = (
 		{attr_name => 'updatestatustime',
                  tabentry => 'nodelist.updatestatustime',
                  access_tabentry => 'nodelist.node=attr:node',
-             },       
-                {attr_name => 'zonename',
+             },             
+		{attr_name => 'zonename',
                  tabentry => 'nodelist.zonename',
                  access_tabentry => 'nodelist.node=attr:node',
-             },
+             },             
 		{attr_name => 'usercomment',
                  tabentry => 'nodelist.comments',
                  access_tabentry => 'nodelist.node=attr:node',
@@ -3121,6 +3103,11 @@ push(@{$defspec{node}->{'attrs'}}, @nodeattrs);
 #########################
 #     routes table    #
 #########################
+#########################
+#  route data object  #
+#########################
+#     routes table    #
+#########################
 @{$defspec{route}->{'attrs'}} = (
         {attr_name => 'routename',
                  tabentry => 'routes.routename',

perl-xCAT/xCAT/Table.pm

@@ -4013,8 +4013,7 @@ sub output_table {
     Example:
 
 	 my $tabh = xCAT::Table->new($table);
-         my $recs=$tabh->getEntries("recid"); # returns row with recid max value in database 
-                                              # and the row with the min value.
+         my $recs=$tabh->getMAXMINEntries("recid"); 
 
     Comments:
         none
@@ -4032,14 +4031,13 @@ sub getMAXMINEntries
     my $rets;
     my $query;
     my $xcatcfg=get_xcatcfg();
-
     # delimit the disable column based on the DB 
     my $disable= &delimitcol("disable");	
     my $qstring;
-    if ($xcatcfg =~ /^DB2:/) {  # for DB2
+    if ($xcatcfg =~ /^DB2:/) {  # for DB2 
        $qstring = "SELECT MAX (\"$attr\") FROM " . $self->{tabname} . " WHERE " . $disable . " is NULL or " .  $disable . " in ('0','no','NO','No','nO')";
     } else {
-     $qstring = "SELECT MAX($attr) FROM " . $self->{tabname} . " WHERE " . $disable . " is NULL or " .  $disable . " in ('0','no','NO','No','nO')";
+       $qstring = "SELECT MAX($attr) FROM " . $self->{tabname} . " WHERE " . $disable . " is NULL or " .  $disable . " in ('0','no','NO','No','nO')";
     }
     $query = $self->{dbh}->prepare($qstring);
 
@@ -4060,10 +4058,10 @@ sub getMAXMINEntries
         }
     }
     $query->finish();
-    if ($xcatcfg =~ /^DB2:/) {  # for DB2
+    if ($xcatcfg =~ /^DB2:/) {  # for DB2 
        $qstring = "SELECT MIN (\"$attr\") FROM " . $self->{tabname} . " WHERE " . $disable . " is NULL or " .  $disable . " in ('0','no','NO','No','nO')";
     } else {
-      $qstring = "SELECT MIN($attr) FROM " . $self->{tabname} . " WHERE " . $disable . " is NULL or " .  $disable . " in ('0','no','NO','No','nO')";
+    $qstring = "SELECT MIN($attr) FROM " . $self->{tabname} . " WHERE " . $disable . " is NULL or " .  $disable . " in ('0','no','NO','No','nO')";
     }
     $query = $self->{dbh}->prepare($qstring);
 
@@ -4078,10 +4076,11 @@ sub getMAXMINEntries
             } else {
                 $rets->{"min"} = $data->{$_};
             }
-            last;    # better be only one value for min
+            last;   # better be only one value  for min
         }
     }
     return $rets;
 }
+
 1;
 

perl-xCAT/xCAT/Utils.pm

@@ -120,38 +120,6 @@ This program module file, is a set of utilities used by xCAT commands.
 
 #-------------------------------------------------------------
 
-=head3   clroptionvars
-
-	- use this routine to clear GetOptions global option variables
-		before calling GetOptions.
-
-	- this may be needed because a "command" may be called twice
-		from the same process - and global options may have been
-		set the first time through. (ex. from a plugin using runxcmd() )
-
-	- should really avoid global vars but this provides a quick fix
-		for now
-
-		ex.  my $rc = xCAT::Utils->clroptionvars($::opt1, $::opt2 ...)
-
-=cut
-
-#-------------------------------------------------------
-sub clroptionvars
-{
-	# skip the class arg and set the rest to undef
-	my $skippedclass=0;
-	foreach (@_) {
-		if ($skippedclass) {
-			$_ = undef;
-		}
-		$skippedclass=1;
-	}
-	return 0;
-}
-
-#-------------------------------------------------------------
-
 =head3 genUUID
     Returns an RFC 4122 compliant UUIDv4 or UUIDv1
     Arguments:
@@ -972,14 +940,15 @@ sub runcmd
     my ($class, $cmd, $exitcode, $refoutput, $stream) = @_;
     $::RUNCMD_RC = 0;
     # redirect stderr to stdout
+   
     if (!($cmd =~ /2>&1$/)) { $cmd .= ' 2>&1'; }   
+    my $hostname = `/bin/hostname`;
+    chomp $hostname;
 
-	if ($::VERBOSE)
-	{
-		# get this systems name as known by xCAT management node
-      my $hostname = `/bin/hostname`;
-      chomp $hostname;
-		my $msg="Running command on $hostname: $cmd";
+
+    if ($::VERBOSE)
+	 {
+      my $msg="Running command on $hostname: $cmd";
 
 		if ($::CALLBACK){
 			my $rsp    = {};
@@ -988,7 +957,7 @@ sub runcmd
 		} else {
 			xCAT::MsgUtils->message("I", "$msg\n");
 		}
-	}
+	 }
 
     my $outref = [];
     if (!defined($stream) || (length($stream) == 0)) { # do not stream
@@ -3170,7 +3139,7 @@ sub isSELINUX
     Input:
       array of nodes in the noderange
     Example:
-    my @mn=xCAT::Utils->noderangecontainsMN($noderange);
+    my $mn=xCAT::Utils->noderangecontainsMN($noderange);
     Comments:
 =cut
 
@@ -3314,7 +3283,7 @@ sub filter_nodes{
             push @{$mpnodes}, @ngpbmc;
         } else {
             push @{$bmcnodes}, @ngpbmc;
-        }
+        } 
     } elsif($cmd eq "getmacs") {
         if (@args && (grep /^-D$/,@args)) {
           push @{$fspnodes}, @ngpfsp;
@@ -3379,8 +3348,8 @@ sub filter_nostatusupdate{
     if ($nodetypetab) {
            $nttabdata     = $nodetypetab->getNodesAttribs(\@allnodes, ['node', 'os']);
            $nodetypetab->close();
-    }
-
+    }    
+    
     #filter out the nodes which support the node provision status feedback
     my @nodesfiltered=();
     if(exists $inref->{$::STATUS_INSTALLING}){
@@ -3390,7 +3359,7 @@ sub filter_nostatusupdate{
         @{$inref->{$::STATUS_INSTALLING}}=@nodesfiltered;
       }
     }
-
+    
     @nodesfiltered=();
     if(exists $inref->{$::STATUS_NETBOOTING}){
       map{ if($nttabdata->{$_}->[0]->{os} !~ /(fedora|rh|centos|sles|ubuntu)/) {push @nodesfiltered,$_;} } @{$inref->{$::STATUS_NETBOOTING}};
@@ -3399,7 +3368,7 @@ sub filter_nostatusupdate{
         @{$inref->{$::STATUS_NETBOOTING}}=@nodesfiltered;
       }
     }
-
+     
 }
 
 sub version_cmp {
@@ -3447,7 +3416,9 @@ sub version_cmp {
     return ( $len_a <=> $len_b )
 }
 
+
 #--------------------------------------------------------------------------------
+
 =head3    fullpathbin
     returns the full path of a specified binary executable file
     Arguments:
@@ -3462,8 +3433,8 @@ sub version_cmp {
          my $CHKCONFIG = xCAT::Utils->fullpathbin("chkconfig");
     Comments:
         none
-
 =cut
+
 #--------------------------------------------------------------------------------
 sub fullpathbin
 {
@@ -3487,4 +3458,6 @@ sub fullpathbin
 
   return $fullpath;
 }
+
+
 1;

perl-xCAT/xCAT/data/discinfo.pm

@@ -14,9 +14,10 @@ require Exporter;
 
 %distnames = (
                  "1310229985.226287" => "centos6",
-		 "1323560292.885204" => "centos6.2",
-		 "1341569670.539525" => "centos6.3",#x86
-		 "1362445555.957609" => "centos6.4",#x86_64
+                 "1323560292.885204" => "centos6.2",
+                 "1341569670.539525" => "centos6.3",#x86
+                 "1362445555.957609" => "centos6.4",#x86_64
+                 "1385726732.061157" => "centos6.5",#x86_64
                  "1176234647.982657" => "centos5",
                  "1156364963.862322" => "centos4.4",
                  "1178480581.024704" => "centos4.5",

perl-xCAT/xCAT/zvmCPUtils.pm

@@ -611,25 +611,39 @@ sub punch2Reader {
             
     # Punch to reader
     # VMUR located in different directories on RHEL and SLES
-    my $out;
+    my $vmur;
     if ( $os =~ m/sles10/i ) {
-        $out = `ssh -o ConnectTimeout=5 $user\@$hcp "$sudo /sbin/vmur punch $options -u $userId -r $srcFile -N $tgtFile"`;
-    } elsif ( $os =~ m/sles11/i ) {
-        $out = `ssh -o ConnectTimeout=5 $user\@$hcp "$sudo /usr/sbin/vmur punch $options -u $userId -r $srcFile -N $tgtFile"`;
-    } elsif ( $os =~ m/rhel/i ) {
-    	$out = `ssh -o ConnectTimeout=5 $user\@$hcp "$sudo /usr/sbin/vmur punch $options -u $userId -r $srcFile -N $tgtFile"`;
+        $vmur = "/sbin/vmur";
     } else {
-    	$out = `ssh -o ConnectTimeout=5 $user\@$hcp "$sudo /usr/sbin/vmur punch $options -u $userId -r $srcFile -N $tgtFile"`;
+        $vmur = "/usr/sbin/vmur";
+    }
+    my $out;
+    my $done = 0;
+    
+    until ( $done ) {
+        $out = `ssh -o ConnectTimeout=5 $user\@$hcp "$sudo $vmur punch $options -u $userId -r $srcFile -N $tgtFile" 2>&1`;
+        my $rc = $? >> 8;
+        if ( $rc == 255 ) {
+            $out = "(Error) Unable to communicate with the zHCP system: $hcp";
+            $done = 1;
+        } elsif ( $out =~ m/A concurrent instance of vmur is already active/i ) {
+            # Recoverable error: retry the command after a delay
+            xCAT::zvmUtils->printSyslog( "punch2Reader() Punch in use on $hcp, retrying in 15 seconds" );
+            sleep( 15 );
+        } else {
+            # Punch appears successful -- Look for the completion string
+            my $searchStr = "created and transferred";
+            if ( !( $out =~ m/$searchStr/i ) ) {
+                chomp( $out );
+                $out = "Failed, punch info: '$out'\n";
+                xCAT::zvmUtils->printSyslog( "punch2Reader() Failed punching $srcFile to $userId from $hcp, info: '$out'" );
+            } else {
+                $out = "Done\n";
+            }
+            $done = 1;
+        }
     }
     
-    # If punch is successful -- Look for this string
-    my $searchStr = "created and transferred";
-    if ( !( $out =~ m/$searchStr/i ) ) {
-        $out = "Failed\n";
-    } else {
-        $out = "Done\n";
-    }
-
     return $out;
 }
 

perl-xCAT/xCAT/zvmUtils.pm

@@ -289,7 +289,7 @@ sub printLn {
     # Print string
     my $rsp;
     my $type = "I";
-    if ($str =~ m/error/i) {  # Set to print error if the string contains error
+    if ($str =~ m/(\(error\)|\sfailed)/i) {  # Set to print error if the string contains error
         $type = "E";
     }
     
@@ -1246,7 +1246,7 @@ sub getArch {
     }
 
     # Get host using VMCP
-    my $arch = `ssh $user\@$node "$sudo uname -p"`;
+    my $arch = `ssh $user\@$node "$sudo uname -m"`;
 
     return ( xCAT::zvmUtils->trimStr($arch) );
 }
@@ -2308,19 +2308,20 @@ sub getUsedFcpDevices {
     Arguments   : Sudoer user name
                   Sudo keyword
                   zHCP hostname
+                  Install root directory
                   Local directory to remotely mount
                   Mount access ('ro' for read only, 'rw' for read write)
                   Directory as known to zHCP (out)
     Returns     : 0 - Mounted, or zHCP and MN are on the same system
                   1 - Mount failed
-    Example     : establishMount( $callback, $::SUDOER, $::SUDO, $hcp, "$installRoot/$provMethod", "ro", \$remoteDeployDir );
+    Example     : establishMount( $callback, $::SUDOER, $::SUDO, $hcp, $installRoot, $provMethod, "ro", \$remoteDeployDir );
     
 =cut
 
 #-------------------------------------------------------
 sub establishMount {
     # Get inputs
-    my ($class, $callback, $sudoer, $sudo, $hcp, $localDir, $access, $mountedPt) = @_;    
+    my ($class, $callback, $sudoer, $sudo, $hcp, $installRoot, $localDir, $access, $mountedPt) = @_;    
     my $out;
 
     # If the target system is not on this system then establish the NFS mount point.
@@ -2338,7 +2339,7 @@ sub establishMount {
     
     if ($masterIp eq $hcpIP) {
         # xCAT MN and zHCP are on the same box and will use the same directory without the need for an NFS mount.
-        $$mountedPt = $localDir;
+        $$mountedPt = "$installRoot/$localDir";
     } else {
         # Determine the hostname for this management node
         my $masterHostname = Sys::Hostname::hostname();
@@ -2347,15 +2348,23 @@ sub establishMount {
             $masterHostname = $masterIp;
         }
         
+        $$mountedPt = "/mnt/$masterHostname$installRoot/$localDir";
+        
+        # If the mount point already exists then return because we are done.
+        my $rc = `ssh $sudoer\@$hcp "$sudo mount | grep $$mountedPt > /dev/null; echo \\\$?"`;
+        if ($rc == 0) {
+            return 0;
+        }
+        
         xCAT::zvmUtils->printSyslog( "establishMount() Preparing the NFS mount point on zHCP ($hcpIP) to xCAT MN $masterHostname($masterIp) for $localDir" );
         
         # Prepare the staging mount point on zHCP, if they need to be established
-        $$mountedPt = "/mnt/$masterHostname$localDir";
-        my $rc = `ssh $sudoer\@$hcp "$sudo mkdir -p $$mountedPt && mount -t nfs -o $access $masterIp:$localDir $$mountedPt; echo \\\$?"`;
+        $rc = `ssh $sudoer\@$hcp "$sudo mkdir -p $$mountedPt && mount -t nfs -o $access $masterIp:/$localDir $$mountedPt; echo \\\$?"`;
         
-        # Return code = 0 (mount succeeded) or 32 (mount already exists)
-        if ($rc != '0' && $rc != '32') {
+        # Return code = 0 (mount succeeded)
+        if ($rc != '0') {
             xCAT::zvmUtils->printLn( $callback, "$hcp: (Error) Unable to establish zHCP mount point: $$mountedPt" );
+            xCAT::zvmUtils->printSyslog( "establishMount() Unable to establish zHCP mount point: $$mountedPt, rc: $rc" );
             return 1;
         }
     }
@@ -2367,9 +2376,12 @@ sub establishMount {
 
 =head3   getFreeRepoSpace
 
-    Description : Get the free space of image repository under /install
+    Description : Get the free space of image repository under /install.
     Arguments   : Node
-    Returns     : The available space for /install
+    Returns     : The available space for /install (e.g. "2.1G ").  
+                  The value is returned as a perl string (e.g. "0 ") to 
+                  avoid perl returning null instead of "0" in the case
+                  of no space available.
     Example     : my $free = getFreeRepoSpace($callback, $node);
     
 =cut
@@ -2393,9 +2405,12 @@ sub getFreeRepoSpace {
     if ($master eq $ip) {
         # If the master IP and node IP match, then it is the management node
         my $out = `$sudo /bin/df -h /install | sed 1d`;
-        $out =~ s/\h+/ /g;
+        # causing problems on other platforms $out =~ s/\h+/ /g;
         my @results = split(' ', $out);
-        return ($results[3]);
+        if ( $results[3] eq "0" ) {
+            $results[3] = "0M";
+        }
+        return $results[3];
     } 
 
     return;
@@ -2475,12 +2490,12 @@ sub findAndUpdatezFcpPool {
         return \%results;
     }
     
-    # Check WWPN and LUN syntax
-    if ( $wwpn && ($wwpn =~ /[^0-9a-f;"]/i) ) {
-        xCAT::zvmUtils->printLn( $callback, "$header: (Error) Invalid world wide portname $wwpn." );
+    # Owner must be specified if status is used
+    if ($status =~ m/used/i && !$owner) {
+        xCAT::zvmUtils->printLn( $callback, "$header: (Error) Owner must be specified if status is used." );
         return \%results;
-    } if ( $lun && ($lun =~ /[^0-9a-f]/i) ) {
-        xCAT::zvmUtils->printLn( $callback, "$header: (Error) Invalid logical unit number $lun." );
+    } elsif ($status =~ m/free/i && $owner) {
+        xCAT::zvmUtils->printLn( $callback, "$header: (Error) Owner must not be specified if status is free." );
         return \%results;
     }
         
@@ -2509,6 +2524,15 @@ sub findAndUpdatezFcpPool {
         # Make sure WWPN and LUN do not have 0x prefix
         $wwpn = xCAT::zvmUtils->replaceStr($wwpn, "0x", "");
         $lun = xCAT::zvmUtils->replaceStr($lun, "0x", "");
+        
+        # Check WWPN and LUN syntax
+        if ( $wwpn && ($wwpn =~ /[^0-9a-f;"]/i) ) {
+            xCAT::zvmUtils->printLn( $callback, "$header: (Error) Invalid world wide portname $wwpn." );
+            return \%results;
+        } if ( $lun && ($lun =~ /[^0-9a-f]/i) ) {
+            xCAT::zvmUtils->printLn( $callback, "$header: (Error) Invalid logical unit number $lun." );
+            return \%results;
+        }
     }
     
     # Find disk pool (create one if non-existent)
@@ -2569,15 +2593,19 @@ sub findAndUpdatezFcpPool {
         }
         
         # Do not continue if no devices can be found
-        if (!$wwpn && !$lun) {
+        if (!$wwpn || !$lun) {
             xCAT::zvmUtils->printLn($callback, "$header: (Error) A suitable device of $size" . "M or larger could not be found");
             return \%results;
         }
     } else {
-    	# Find given WWPN and LUN. Do not continue if device is used
+        # Find given WWPN and LUN. Do not continue if device is used
         my $select = `ssh $user\@$hcp "$sudo cat $zfcpDir/$pool.conf" | grep -i "$wwpn,$lun"`;
         chomp($select);
-        
+        if (!$select) {
+            xCAT::zvmUtils->printLn($callback, "$header: (Error) zFCP device 0x$wwpn/0x$lun could not be found in zFCP pool $pool");
+            return \%results;
+        }
+
         @info = split(',', $select);
         
         if ($size) {
@@ -2585,13 +2613,11 @@ sub findAndUpdatezFcpPool {
                 # Convert to MegaBytes
                 $info[3] =~ s/\D//g;
                 $info[3] = int($info[3]) * 1024
-            } elsif ($info[3] =~ m/M/i) {
+            } else {
                 # Do nothing
                 $info[3] =~ s/\D//g;
-            } else {
-                next;
             }
-                
+            
             # Do not continue if specified device does not have enough capacity
             if ($info[3] < $size) {
                 xCAT::zvmUtils->printLn($callback, "$header: (Error) FCP device $wwpn/$lun is not large enough");
@@ -2602,7 +2628,7 @@ sub findAndUpdatezFcpPool {
         # Find range of the specified disk
         $range = $info[4];
     }
-       
+    
     # If there are multiple paths, take the 1st one
     # Handle multi-pathing in postscript because autoyast/kickstart does not support it.
     my $origWwpn = $wwpn;
@@ -2612,117 +2638,23 @@ sub findAndUpdatezFcpPool {
     }
         
     xCAT::zvmUtils->printLn($callback, "$header: Found FCP device 0x$wwpn/0x$lun");
-        
-    # Find a free FCP device based on the given range
-    if ($fcpDevice =~ m/^auto/i) {
-        my @ranges;
-        my $min;
-        my $max;
-        my $found = 0;
-                
-        if ($range =~ m/;/i) {
-            @ranges = split(';', $range);
-        } else {
-            push(@ranges, $range);
-        }
-                    
-        if (!$found) {
-            # If the node has an eligible FCP device, use it
-            my @deviceList = xCAT::zvmUtils->getDedicates($callback, $user, $owner);
-            foreach (@deviceList) {
-                # Check if this devide is eligible (among the range specified for disk $lun)
-                @info = split(' ', $_);
-                my $candidate = $info[2];
-                foreach (@ranges) {
-                    ($min, $max) = split('-', $_);
-                    if (hex($candidate) >= hex($min) && hex($candidate) <= hex($max)) {
-                        $found = 1;
-                        $fcpDevice = uc($candidate);
-                        
-                        last;
-                    }
-                }
-                
-                if ($found) {
-                	xCAT::zvmUtils->printLn($callback, "$header: Found eligible FCP channel $fcpDevice");
-                    last;
-                }       
-            }
-        }
-        
-        if (!$found) {
-            # If the node has no eligible FCP device, find a free one for it.
-            my %usedDevices = xCAT::zvmUtils->getUsedFcpDevices($user, $hcp);
-            
-            my $hcpUserId = xCAT::zvmCPUtils->getUserId($user, $hcp);
-            $hcpUserId =~ tr/a-z/A-Z/;
-        
-            # Find a free FCP channel
-            $out = `ssh $user\@$hcp "$sudo $dir/smcli System_WWPN_Query -T $hcpUserId" | egrep -i "FCP device number|Status"`;
-            my @devices = split( "\n", $out );
-            for (my $i = 0; $i < @devices; $i++) {
-                # Extract the device number and status
-                $fcpDevice = $devices[$i];
-                $fcpDevice =~ s/^FCP device number:(.*)/$1/;
-                $fcpDevice =~ s/^\s+//;
-                $fcpDevice =~ s/\s+$//;
-                        
-                $i++;
-                my $fcpStatus = $devices[$i];
-                $fcpStatus =~ s/^Status:(.*)/$1/;
-                $fcpStatus =~ s/^\s+//;
-                $fcpStatus =~ s/\s+$//;                    
-                        
-                # Only look at free FCP devices
-                if ($fcpStatus =~ m/free/i) {                    
-                    # If the device number is within the specified range, exit out of loop
-                    # Range: 3B00-3C00;4B00-4C00;5E12-5E12
-                    foreach (@ranges) {
-                        ($min, $max) = split('-', $_);
-                        if (hex($fcpDevice) >= hex($min) && hex($fcpDevice) <= hex($max)) {
-                            $fcpDevice = uc($fcpDevice);
-                
-                            # Used found FCP channel if not in use or allocated                        
-                            if (!$usedDevices{$fcpDevice}) {
-                                $found = 1;
-                                last;
-                            }
-                        }
-                    }
-                }
-                
-                # Break out of loop if FCP channel is found
-                if ($found) {
-                	xCAT::zvmUtils->printLn($callback, "$header: Found FCP channel within acceptable range $fcpDevice");
-                    last;
-                }
-            }
-        }
-            
-        # Do not continue if no FCP channel is found
-        if (!$found) {
-            xCAT::zvmUtils->printLn($callback, "$header: (Error) A suitable FCP channel could not be found");
+    
+    if ( ($status =~ m/used/i) && ($fcpDevice =~ /^auto/i) ) {
+        # select an eligible FCP device
+        $fcpDevice = xCAT::zvmUtils->selectFcpDevice($callback, $header, $user, $hcp, $fcpDevice, $range, $owner);
+        if (!$fcpDevice) {
             return \%results;
         }
-    }
-    
-    # If there are multiple devices (multipathing), take the 1st one
-    if ($fcpDevice) {
-        if ($fcpDevice =~ m/;/i) {
-            @info = split(';', $fcpDevice);
-            $fcpDevice = xCAT::zvmUtils->trimStr($info[0]);
-        }
-                    
-        # Make sure channel has a length of 4
-        while (length($fcpDevice) < 4) {
-            $fcpDevice = "0" . $fcpDevice;
-        }
+    } elsif ($status =~ m/free/i) {
+        # Owner and FCP channel make no sense when status is free
+        $fcpDevice = "";
+        $owner = "";
     }
             
     # Mark WWPN and LUN as used, free, or reserved and set the owner/channel appropriately
     # This config file keeps track of the owner of each device, which is useful in nodeset
     $size = $size . "M";
-    my $select = `ssh $user\@$hcp "$sudo cat $zfcpDir/$pool.conf" | grep -i "$lun" | grep -i "$wwpn"`;
+    my $select = `ssh $user\@$hcp "$sudo cat $zfcpDir/$pool.conf" | grep -i "$lun"`;
     chomp($select);
     if ($select) {
         @info = split(',', $select);
@@ -2759,6 +2691,156 @@ sub findAndUpdatezFcpPool {
 
 #-------------------------------------------------------
 
+=head3   selectFcpDevice
+
+    Description : Select an eligible FCP device for attaching a zFCP device to a node
+    Arguments   :   Message header
+                    User (root or non-root)
+                    zHCP
+                    candidate FCP devices or auto
+                    FCP device range
+                    zFCP device owner
+    Returns     : selected FCP device or empty if no one is selected
+    Example     : my $fcpDevice = xCAT::zvmUtils->selectFcpDevice($callback, $header, $user, $hcp, $fcpDevice, $range, $owner);
+    
+=cut
+
+#-------------------------------------------------------
+sub selectFcpDevice {
+    # Get inputs
+    my ($class, $callback, $header, $user, $hcp, $fcpDevice, $range, $owner) = @_;
+        
+    # Determine if sudo is used
+    my $sudo = "sudo";
+    if ($user eq "root") {
+        $sudo = "";
+    }
+    
+    # Directory where executables are on zHCP
+    my $dir = "/opt/zhcp/bin";
+        
+    # Directory where FCP disk pools are on zHCP
+    my $zfcpDir = "/var/opt/zhcp/zfcp";
+    
+    my %results = ('rc' => -1);  # Default to error
+    
+    # Check FCP device syntax
+    if ($fcpDevice && ($fcpDevice !~ /^auto/i) && ($fcpDevice =~ /[^0-9a-f]/i)) {
+        xCAT::zvmUtils->printLn($callback, "$header: (Error) Invalid FCP channel address $fcpDevice.");
+        return;
+    }
+    
+    # Find a free FCP device based on the given range
+    if ($fcpDevice =~ m/^auto/i) {
+        my @ranges;
+        my $min;
+        my $max;
+        my $found = 0;
+                
+        if ($range =~ m/;/i) {
+            @ranges = split(';', $range);
+        } else {
+            push(@ranges, $range);
+        }
+                    
+        if (!$found) {
+            # If the node has an eligible FCP device, use it
+            my @deviceList = xCAT::zvmUtils->getDedicates($callback, $user, $owner);
+            foreach (@deviceList) {
+                # Check if this devide is eligible (among the range specified for disk $lun)
+                my @info = split(' ', $_);
+                my $candidate = $info[2];
+                foreach (@ranges) {
+                    ($min, $max) = split('-', $_);
+                    if (hex($candidate) >= hex($min) && hex($candidate) <= hex($max)) {
+                        $found = 1;
+                        $fcpDevice = uc($candidate);
+                        
+                        last;
+                    }
+                }
+                
+                if ($found) {
+                    xCAT::zvmUtils->printLn($callback, "$header: Found eligible FCP channel $fcpDevice");
+                    last;
+                }       
+            }
+        }
+        
+        if (!$found) {
+            # If the node has no eligible FCP device, find a free one for it.
+            my %usedDevices = xCAT::zvmUtils->getUsedFcpDevices($user, $hcp);
+            
+            my $hcpUserId = xCAT::zvmCPUtils->getUserId($user, $hcp);
+            $hcpUserId =~ tr/a-z/A-Z/;
+        
+            # Find a free FCP channel
+            my $out = `ssh $user\@$hcp "$sudo $dir/smcli System_WWPN_Query -T $hcpUserId" | egrep -i "FCP device number|Status"`;
+            my @devices = split( "\n", $out );
+            for (my $i = 0; $i < @devices; $i++) {
+                # Extract the device number and status
+                $fcpDevice = $devices[$i];
+                $fcpDevice =~ s/^FCP device number:(.*)/$1/;
+                $fcpDevice =~ s/^\s+//;
+                $fcpDevice =~ s/\s+$//;
+                        
+                $i++;
+                my $fcpStatus = $devices[$i];
+                $fcpStatus =~ s/^Status:(.*)/$1/;
+                $fcpStatus =~ s/^\s+//;
+                $fcpStatus =~ s/\s+$//;                    
+                        
+                # Only look at free FCP devices
+                if ($fcpStatus =~ m/free/i) {                    
+                    # If the device number is within the specified range, exit out of loop
+                    # Range: 3B00-3C00;4B00-4C00;5E12-5E12
+                    foreach (@ranges) {
+                        ($min, $max) = split('-', $_);
+                        if (hex($fcpDevice) >= hex($min) && hex($fcpDevice) <= hex($max)) {
+                            $fcpDevice = uc($fcpDevice);
+                
+                            # Use found FCP channel if not in use or allocated                        
+                            if (!$usedDevices{$fcpDevice}) {
+                                $found = 1;
+                                last;
+                            }
+                        }
+                    }
+                }
+                
+                # Break out of loop if FCP channel is found
+                if ($found) {
+                    xCAT::zvmUtils->printLn($callback, "$header: Found FCP channel within acceptable range $fcpDevice");
+                    last;
+                }
+            }
+        }
+            
+        # Do not continue if no FCP channel is found
+        if (!$found) {
+            xCAT::zvmUtils->printLn($callback, "$header: (Error) A suitable FCP channel could not be found");
+            return;
+        }
+    }
+    
+    # If there are multiple devices (multipathing), take the 1st one
+    if ($fcpDevice) {
+        if ($fcpDevice =~ m/;/i) {
+            my @info = split(';', $fcpDevice);
+            $fcpDevice = xCAT::zvmUtils->trimStr($info[0]);
+        }
+                    
+        # Make sure channel has a length of 4
+        while (length($fcpDevice) < 4) {
+            $fcpDevice = "0" . $fcpDevice;
+        }
+    }
+    
+    return $fcpDevice;
+}
+
+#-------------------------------------------------------
+
 =head3   findzFcpDevicePool
 
     Description : Find the zFCP storage pool that contains the given zFCP device
@@ -2807,7 +2889,7 @@ sub findzFcpDevicePool {
                     WWPN
                     LUN
     Returns     : Architecture of node
-    Example     : my $deviceRef = xCAT::zvmUtils->findzFcpDeviceAttr($user, $hcp, $wwpn, $lun);
+    Example     : my $deviceRef = xCAT::zvmUtils->findzFcpDeviceAttr($user, $hcp, $pool, $wwpn, $lun);
     
 =cut
 
@@ -2827,7 +2909,7 @@ sub findzFcpDeviceAttr {
 
     # Find the SCSI/FCP device
     # Entry order: status,wwpn,lun,size,range,owner,channel,tag
-    my @info = split("\n", `ssh $user\@$hcp "$sudo grep \"$wwpn,$lun\" $zfcpDir/$pool.conf"`);
+    my @info = split("\n", `ssh $user\@$hcp "$sudo grep -i \"$wwpn,$lun\" $zfcpDir/$pool.conf"`);
     my $entry = $info[0];
     chomp($entry);
     

src/xcatflowrequest.c

@@ -1,48 +0,0 @@
-/* IBM(c) 2013 EPL licens http://www.eclipse.org/legal/epl-v10.html
- * Jarrod Johnson - jbjohnso@us.ibm.com
- * This program periodically transmits a udp packet to designated xCAT server
- * It waits for an 'ok' and then exits
- */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-int main(int argc, char* argv[]) { 
-	int server;
-	struct addrinfo hints;
-	struct addrinfo *results,*cur;
-	struct timeval timeout;
-	int canread=0;
-	char buffer[128];
-	srand(time(NULL));
-	memset(&hints,0,sizeof(struct addrinfo));
-	hints.ai_family = AF_UNSPEC;
-	hints.ai_socktype = SOCK_DGRAM;
-	hints.ai_protocol = IPPROTO_UDP;
-	fd_set selectset;
-	getaddrinfo(argv[1],argv[2],&hints,&results);
-	server = socket(AF_UNSPEC,SOCK_DGRAM,17);
-	for (cur=results; cur != NULL; cur = cur->ai_next) {
-		server = socket(cur->ai_family,cur->ai_socktype,cur->ai_protocol);
-		if (server == -1) continue;
-		if (connect(server,cur->ai_addr,cur->ai_addrlen) != -1) break;
-		close(server);
-	}
-	FD_ZERO(&selectset);
-	FD_SET(server,&selectset);
-	while (1) {
-		timeout.tv_sec = rand() % 120+60;
-		timeout.tv_usec = rand() % 10000;
-		write(server,"resourcerequest: xcatd\n",strlen("resourcerequest: xcatd\n"));
-		canread = select(FD_SETSIZE,&selectset,NULL,NULL,&timeout);
-		if (canread) {
-			read(server,buffer,sizeof(buffer));
-			if (strncmp(buffer,"resourcerequest: ok",strlen("resourcerequest: ok"))==0) {
-				exit(0);
-			}
-		}
-	}
-}

xCAT-OpenStack-baremetal/lib/perl/xCAT_plugin/openstack.pm

@@ -497,8 +497,40 @@ sub deploy_ops_bm_node {
 		return 1;
 	}		
  
-    #set boot order, assuming it is ipmi nodes for now
-    # TODO: add support for system power hw.
+    #deploy the node now, supported nodehm.mgt values: ipmi, blade,fsp, hmc.
+    my $hmtab  = xCAT::Table->new('nodehm');
+	my $hment = $hmtab->getNodeAttribs($node,['mgt']);
+	if ($hment && $hment->{'mgt'}) {
+		my $mgt = $hment->{'mgt'};
+		if ($mgt eq 'ipmi') { 
+			deploy_bmc_node($callback, $doreq, $node);
+		} elsif (($mgt eq 'blade') || ($mgt eq 'fsp')) {
+			deploy_blade($callback, $doreq, $node);
+		} elsif ($mgt eq 'hmc') {
+			deploy_hmc_node($callback, $doreq, $node);
+		} else {
+			my $rsp;
+			push @{$rsp->{data}}, "Node $node: nodehm.mgt=$mgt is not supported in the OpenStack cloud.";
+			xCAT::MsgUtils->message("E", $rsp, $callback);
+			return 1;
+		}
+	} else {
+		#nodehm.mgt must setup for node 
+		my $rsp;
+		push @{$rsp->{data}}, "Node $node: nodehm.mgt cannot be empty in order to deploy.";
+		xCAT::MsgUtils->message("E", $rsp, $callback);
+		return 1;
+	}
+
+}
+
+# Deploy a rack-mounted node
+sub deploy_bmc_node {
+	my $callback = shift;
+	my $doreq = shift;
+	my $node = shift;
+
+    #set boot order
 	my $cmd = qq~net~;
 	my $output = xCAT::Utils->runxcmd(
 		{command => ["rsetboot"],
@@ -525,7 +557,62 @@ sub deploy_ops_bm_node {
 		push @{$rsp->{data}}, "$output";
 		xCAT::MsgUtils->message("E", $rsp, $callback);
 		return 1;
+	}
+}
+
+# Deploy a blade or fsp controlled node
+sub deploy_blade {
+	my $callback = shift;
+	my $doreq = shift;
+	my $node = shift;
+
+    #set boot order
+	my $cmd = qq~net~;
+	my $output = xCAT::Utils->runxcmd(
+		{command => ["rbootseq"],
+		 node    => [$node], 
+		 arg     => [$cmd]},
+		$doreq, -1, 1);
+	if ($::RUNCMD_RC != 0) {
+		my $rsp;
+		push @{$rsp->{data}}, "rbootseq:";
+		push @{$rsp->{data}}, "$output";
+		xCAT::MsgUtils->message("E", $rsp, $callback);
 	}		
+	
+    #reboot the node
+	my $cmd = qq~boot~;
+	my $output = xCAT::Utils->runxcmd(
+		{command => ["rpower"],
+		 node    => [$node], 
+		 arg     => [$cmd]},
+		$doreq, -1, 1);
+	if ($::RUNCMD_RC != 0) {
+		my $rsp;
+		push @{$rsp->{data}}, "rpower:";
+		push @{$rsp->{data}}, "$output";
+		xCAT::MsgUtils->message("E", $rsp, $callback);
+		return 1;
+	}	
+}
+
+# Deploy a node controlled by HMC
+sub deploy_hmc_node {
+	my $callback = shift;
+	my $doreq = shift;
+	my $node = shift;
+
+	my $output = xCAT::Utils->runxcmd(
+		{command => ["rnetboot"],
+		 node    => [$node]},
+		$doreq, -1, 1);
+	if ($::RUNCMD_RC != 0) {
+		my $rsp;
+		push @{$rsp->{data}}, "rnetboot:";
+		push @{$rsp->{data}}, "$output";
+		xCAT::MsgUtils->message("E", $rsp, $callback);
+		return 1;
+	}	
 }
 
 

xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/driver.py

@@ -168,7 +168,7 @@ class xCATBareMetalDriver(bm_driver.BareMetalDriver):
         """
  	    #import pdb
 	    #pdb.set_trace()
-	    context = nova_context.get_admin_context()
+        context = nova_context.get_admin_context()
         try:
             node = bm_driver._get_baremetal_node_by_instance_uuid(instance['uuid'])
             

xCAT-OpenStack-baremetal/xpod2man

@@ -21,7 +21,7 @@ my @pods = getPodList($poddir);
 #foreach (@pods) { print "$_\n"; } exit;
 
 # Build the cmd overview page.
-writesummarypage("$poddir/man1/xcat.1.pod", @pods);
+#writesummarypage("$poddir/man1/xcat.1.pod", @pods);
 
 # Build the man page for each pod.
 #mkdir($mandir) or die "Error: could not create $mandir.\n";
@@ -126,6 +126,7 @@ sub getPodList {
 
 
 # Create the xcat man page that gives a summary description of each xcat cmd.
+# Not used.
 sub writesummarypage {
 	my $file = shift;       # relative path file name of the man page
 	# the rest of @_ contains the pod files that describe each cmd

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/.rubocop.yml

@@ -0,0 +1,15 @@
+AllCops:
+  Excludes:
+    - test/**
+    - vendor/**
+
+AlignParameters:
+  Enabled: false
+Encoding:
+  Enabled: false
+HashSyntax:
+  Enabled: false
+LineLength:
+  Enabled: false
+MethodLength:
+  Max: 30

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/.travis.yml

@@ -0,0 +1,9 @@
+rvm:
+  - 1.9.3
+  - 2.0.0
+before_script:
+  - bundle exec berks install
+script:
+  - bundle exec foodcritic -f any . --tags ~FC007 --tags ~FC015 --tags ~FC023
+  # - bundle exec rspec --color --format progress
+  - bundle exec rubocop

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/Berksfile

@@ -0,0 +1,7 @@
+site :opscode
+metadata
+
+group :integration do
+  cookbook 'apt', '~> 2.0'
+  cookbook 'yum', '~> 2.0'
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/CHANGELOG.md

@@ -0,0 +1,198 @@
+apache2 Cookbook Changelog
+==========================
+This file is used to list changes made in each version of the apache2 cookbook.
+
+v1.8.4
+------
+### Bug
+- **[COOK-3769](https://tickets.opscode.com/browse/COOK-3769)** - Fix a critical bug where the `apache_module` could not enable modules
+
+
+v1.8.2
+------
+### Bug
+- **[COOK-3766](https://tickets.opscode.com/browse/COOK-3766)** - Fix an issue where the `mod_ssl` recipe fails due to a missing attribute
+
+
+v1.8.0
+------
+### Bug
+- **[COOK-3680](https://tickets.opscode.com/browse/COOK-3680)** - Update template paths
+- **[COOK-3570](https://tickets.opscode.com/browse/COOK-3570)** - Apache cookbook breaks on RHEL / CentOS 6
+- **[COOK-2944](https://tickets.opscode.com/browse/COOK-2944)** - Fix foodcritic failures
+- **[COOK-2893](https://tickets.opscode.com/browse/COOK-2893)** - Improve mod_auth_openid recipe with guards and idempotency
+- **[COOK-2758](https://tickets.opscode.com/browse/COOK-2758)** - Fix use of non-existent attribute
+
+### New Feature
+- **[COOK-3665](https://tickets.opscode.com/browse/COOK-3665)** - Add recipe for mod_userdir
+- **[COOK-3646](https://tickets.opscode.com/browse/COOK-3646)** - Add recipe for mod_cloudflare
+- **[COOK-3213](https://tickets.opscode.com/browse/COOK-3213)** - Add recipe for mod_info
+
+### Improvement
+- **[COOK-3656](https://tickets.opscode.com/browse/COOK-3656)** - Parameterize apache2 binary
+- **[COOK-3562](https://tickets.opscode.com/browse/COOK-3562)** - Allow mod_proxy settings to be configured as attributes
+- **[COOK-3326](https://tickets.opscode.com/browse/COOK-3326)** - Fix default_test to use ServerTokens attribute
+- **[COOK-2635](https://tickets.opscode.com/browse/COOK-2635)** - Add support for SVG mime types
+- **[COOK-2598](https://tickets.opscode.com/browse/COOK-2598)** - FastCGI Module only works on Debian-based platforms
+- **[COOK-1984](https://tickets.opscode.com/browse/COOK-1984)** - Add option to configure the address apache listens to
+
+
+v1.7.0
+------
+### Improvement
+
+- [COOK-3073]: make access.log location configurable per-platform
+- [COOK-3074]: don't hardcode the error.log location in the default site config
+- [COOK-3268]: don't hardcode DocumentRoot and cgi-bin locations in `default_site`
+
+### New Feature
+
+- [COOK-3184]: Add `mod_filter` recipe to Apache2-cookbook
+- [COOK-3236]: Add `mod_action` recipe to Apache2-cookbook
+
+v1.6.6
+------
+1.6.4 had a missed step in the automated release, long live 1.6.6.
+
+### Bug
+
+- [COOK-3018]: apache2_module does duplicate delayed restart of apache2 service when conf = true
+- [COOK-3027]: Default site enable true, then false, does not disable default site
+- [COOK-3109]: fix apache lib_dir arch attribute regexp
+
+v1.6.2
+------
+- [COOK-2535] - `mod_auth_openid` requires libtool to run autogen.sh
+- [COOK-2667] - Typo in usage documentation
+- [COOK-2461] - `apache2::mod_auth_openid` fails on some ubuntu systems
+- [COOK-2720] - Apache2 minitest helper function `ran_recipe` is not portable
+
+v1.6.0
+------
+- [COOK-2372] - apache2 mpm_worker: add ServerLimit attribute (default to 16)
+
+v1.5.0
+------
+The `mod_auth_openid` attributes are changed. The upstream maintainer deprecated the older release versions, and the source repository has releases available at specific SHA1SUM references. The new attribute, `node['apache']['mod_auth_openid']['ref']` is used to set this.
+
+- [COOK-2198] - `apache::mod_auth_openid` compiles from source, but does not install make on debian/ubuntu
+- [COOK-2224] - version conflict between cucumber and other gems
+- [COOK-2248] - `apache2::mod_php5` uses `not_if` "which php" without ensuring package 'which' is installed
+- [COOK-2269] - Set allow list for mod_status incase external monitor scripts need
+- [COOK-2276] - cookbook apache2 documentation regarding listening ports doesn't match default attributes
+- [COOK-2296] - `mod_auth_openid` doesn't have tags/releases for the version I need for features and fixes
+- [COOK-2323] - Add Oracle linux support
+
+v1.4.2
+------
+- [COOK-1721] - fix logrotate recipe
+
+v1.4.0
+------
+- [COOK-1456] - iptables enhancements
+- [COOK-1473] - apache2 does not disable default site when setting "`default_site_enabled`" back to false
+- [COOK-1824] - the apache2 cookbook needs to specify which binary is used on rhel platform
+- [COOK-1916] - Download location wrong for apache2 `mod_auth_openid` >= 0.7
+- [COOK-1917] - Improve `mod_auth_openid` recipe to handle module upgrade more gracefully
+- [COOK-2029] - apache2 restarts on every run on RHEL and friends, generate-module-list on every run.
+- [COOK-2036] - apache2: Cookbook style
+
+v1.3.2
+------
+- [COOK-1804] - fix `web_app` definition parameter so site can be disabled.
+
+v1.3.0
+------
+- [COOK-1738] - Better configuration for `mod_include` and some overrides in `web_app` definition
+- [COOK-1470] - Change SSL Ciphers to Mitigate BEAST attack
+
+v1.2.0
+------
+- [COOK-692] - delete package conf.d files in module recipes, for EL
+- [COOK-1693] - Foodcritic finding for unnecessary string interpolation
+- [COOK-1757] - platform_family and better style / usage practices
+
+v1.1.16
+-------
+re-releasing as .16 due to error on tag 1.1.14
+
+- [COOK-1466] - add `mod_auth_cas` recipe
+- [COOK-1609] - apache2 changes ports.conf twice per run when using apache2::mod_ssl
+
+v1.1.12
+-------
+- [COOK-1436] - restore apache2 web_app definition
+- [COOK-1356] - allow ExtendedStatus via attribute
+- [COOK-1403] - add mod_fastcgi recipe
+
+v1.1.10
+-------
+- [COOK-1315] - allow the default site to not be enabled
+- [COOK-1328] - cookbook tests (minitest, cucumber)
+
+v1.1.8
+------
+- Some platforms with minimal installations that don't have perl won't have a `node['languages']['perl']` attribute, so remove the conditional and rely on the power of idempotence in the package resource.
+- [COOK-1214] - address foodcritic warnings
+- [COOK-1180] - add `mod_logio` and fix `mod_proxy`
+
+v1.1.6
+------
+FreeBSD users: This release requires the `freebsd` cookbook. See README.md.
+
+- [COOK-1025] - freebsd support in mod_php5 recipe
+
+v1.1.4
+------
+- [COOK-1100] - support amazon linux
+
+v1.1.2
+------
+- [COOK-996] - apache2::mod_php5 can cause PHP and module API mismatches
+- [COOK-1083] - return string for v_f_p and use correct value for default
+
+v1.1.0
+------
+- [COOK-861] - Add `mod_perl` and apreq2
+- [COOK-941] - fix `mod_auth_openid` on FreeBSD
+- [COOK-1021] - add a commented-out LoadModule directive to keep apxs happy
+- [COOK-1022] - consistency for icondir attribute
+- [COOK-1023] - fix platform test for attributes
+- [COOK-1024] - fix a2enmod script so it runs cleanly on !bash
+- [COOK-1026] - fix `error_log` location on FreeBSD
+
+v1.0.8
+------
+- COOK-548 - directory resource doesn't have backup parameter
+
+v1.0.6
+------
+- COOK-915 - update to `mod_auth_openid` version 0.6, see __Recipes/mod_auth_openid__ below.
+- COOK-548 - Add support for FreeBSD.
+
+v1.0.4
+------
+- COOK-859 - don't hardcode module paths
+
+v1.0.2
+------
+- Tickets resolved in this release: COOK-788, COOK-782, COOK-780
+
+v1.0.0
+------
+- Red Hat family support is greatly improved, all recipes except `god_monitor` converge.
+- Recipe `mod_auth_openid` now works on RHEL family distros
+- Recipe `mod_php5` will now remove config from package on RHEL family so it doesn't conflict with the cookbook's.
+- Added `php5.conf.erb` template for `mod_php5` recipe.
+- Create the run state directory for `mod_fcgid` to prevent a startup error on RHEL version 6.
+- New attribute `node['apache']['lib_dir']` to handle lib vs lib64 on RHEL family distributions.
+- New attribute `node['apache']['group']`.
+- Scientific Linux support added.
+- Use a file resource instead of the generate-module-list executed perl script on RHEL family.
+- "default" site can now be disabled.
+- web_app now has an "enable" parameter.
+- Support for dav_fs apache module.
+- Tickets resolved in this release: COOK-754, COOK-753, COOK-665, COOK-624, COOK-579, COOK-519, COOK-518
+- Fix node references in template for a2dissite
+- Use proper user and group attributes on files and templates.
+- Replace the anemic README.rdoc with this new and improved superpowered README.md :).

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/CONTRIBUTING.md

@@ -0,0 +1,257 @@
+# Contributing to Opscode Cookbooks
+
+We are glad you want to contribute to Opscode Cookbooks! The first
+step is the desire to improve the project.
+
+You can find the answers to additional frequently asked questions
+[on the wiki](http://wiki.opscode.com/display/chef/How+to+Contribute).
+
+You can find additional information about
+[contributing to cookbooks](http://wiki.opscode.com/display/chef/How+to+Contribute+to+Opscode+Cookbooks)
+on the wiki as well.
+
+## Quick-contribute
+
+* Create an account on our [bug tracker](http://tickets.opscode.com)
+* Sign our contributor agreement (CLA)
+[ online](https://secure.echosign.com/public/hostedForm?formid=PJIF5694K6L)
+(keep reading if you're contributing on behalf of your employer)
+* Create a ticket for your change on the
+  [bug tracker](http://tickets.opscode.com)
+* Link to your patch as a rebased git branch or pull request from the
+  ticket
+* Resolve the ticket as fixed
+
+We regularly review contributions and will get back to you if we have
+any suggestions or concerns.
+
+## The Apache License and the CLA/CCLA
+
+Licensing is very important to open source projects, it helps ensure
+the software continues to be available under the terms that the author
+desired. Chef uses the Apache 2.0 license to strike a balance between
+open contribution and allowing you to use the software however you
+would like to.
+
+The license tells you what rights you have that are provided by the
+copyright holder. It is important that the contributor fully
+understands what rights they are licensing and agrees to them.
+Sometimes the copyright holder isn't the contributor, most often when
+the contributor is doing work for a company.
+
+To make a good faith effort to ensure these criteria are met, Opscode
+requires a Contributor License Agreement (CLA) or a Corporate
+Contributor License Agreement (CCLA) for all contributions. This is
+without exception due to some matters not being related to copyright
+and to avoid having to continually check with our lawyers about small
+patches.
+
+It only takes a few minutes to complete a CLA, and you retain the
+copyright to your contribution.
+
+You can complete our contributor agreement (CLA)
+[ online](https://secure.echosign.com/public/hostedForm?formid=PJIF5694K6L).
+If you're contributing on behalf of your employer, have your employer
+fill out our
+[Corporate CLA](https://secure.echosign.com/public/hostedForm?formid=PIE6C7AX856)
+instead.
+
+## Ticket Tracker (JIRA)
+
+The [ticket tracker](http://tickets.opscode.com) is the most important
+documentation for the code base. It provides significant historical
+information, such as:
+
+* Which release a bug fix is included in
+* Discussion regarding the design and merits of features
+* Error output to aid in finding similar bugs
+
+Each ticket should aim to fix one bug or add one feature.
+
+## Using git
+
+You can get a quick copy of the repository for this cookbook by
+running `git clone
+git://github.com/opscode-coobkooks/COOKBOOKNAME.git`.
+
+For collaboration purposes, it is best if you create a Github account
+and fork the repository to your own account. Once you do this you will
+be able to push your changes to your Github repository for others to
+see and use.
+
+If you have another repository in your GitHub account named the same
+as the cookbook, we suggest you suffix the repository with -cookbook.
+
+### Branches and Commits
+
+You should submit your patch as a git branch named after the ticket,
+such as COOK-1337. This is called a _topic branch_ and allows users to
+associate a branch of code with the ticket.
+
+It is a best practice to have your commit message have a _summary
+line_ that includes the ticket number, followed by an empty line and
+then a brief description of the commit. This also helps other
+contributors understand the purpose of changes to the code.
+
+    [COOK-1757] - platform_family and style
+
+    * use platform_family for platform checking
+    * update notifies syntax to "resource_type[resource_name]" instead of
+      resources() lookup
+    * COOK-692 - delete config files dropped off by packages in conf.d
+    * dropped debian 4 support because all other platforms have the same
+      values, and it is older than "old stable" debian release
+
+Remember that not all users use Chef in the same way or on the same
+operating systems as you, so it is helpful to be clear about your use
+case and change so they can understand it even when it doesn't apply
+to them.
+
+### Github and Pull Requests
+
+All of Opscode's open source cookbook projects are available on
+[Github](http://www.github.com/opscode-cookbooks).
+
+We don't require you to use Github, and we will even take patch diffs
+attached to tickets on the tracker. However Github has a lot of
+convenient features, such as being able to see a diff of changes
+between a pull request and the main repository quickly without
+downloading the branch.
+
+If you do choose to use a pull request, please provide a link to the
+pull request from the ticket __and__ a link to the ticket from the
+pull request. Because pull requests only have two states, open and
+closed, we can't easily filter pull requests that are waiting for a
+reply from the author for various reasons.
+
+### More information
+
+Additional help with git is available on the
+[Working with Git](http://wiki.opscode.com/display/chef/Working+with+Git)
+wiki page.
+
+## Functional and Unit Tests
+
+This cookbook is set up to run tests under
+[Opscode's test-kitchen](https://github.com/opscode/test-kitchen). It
+uses minitest-chef to run integration tests after the node has been
+converged to verify that the state of the node.
+
+Test kitchen should run completely without exception using the default
+[baseboxes provided by Opscode](https://github.com/opscode/bento).
+Because Test Kitchen creates VirtualBox machines and runs through
+every configuration in the Kitchenfile, it may take some time for
+these tests to complete.
+
+If your changes are only for a specific recipe, run only its
+configuration with Test Kitchen. If you are adding a new recipe, or
+other functionality such as a LWRP or definition, please add
+appropriate tests and ensure they run with Test Kitchen.
+
+If any don't pass, investigate them before submitting your patch.
+
+Any new feature should have unit tests included with the patch with
+good code coverage to help protect it from future changes. Similarly,
+patches that fix a bug or regression should have a _regression test_.
+Simply put, this is a test that would fail without your patch but
+passes with it. The goal is to ensure this bug doesn't regress in the
+future. Consider a regular expression that doesn't match a certain
+pattern that it should, so you provide a patch and a test to ensure
+that the part of the code that uses this regular expression works as
+expected. Later another contributor may modify this regular expression
+in a way that breaks your use cases. The test you wrote will fail,
+signalling to them to research your ticket and use case and accounting
+for it.
+
+If you need help writing tests, please ask on the Chef Developer's
+mailing list, or the #chef-hacking IRC channel.
+
+## Code Review
+
+Opscode regularly reviews code contributions and provides suggestions
+for improvement in the code itself or the implementation.
+
+We find contributions by searching the ticket tracker for _resolved_
+tickets with a status of _fixed_. If we have feedback we will reopen
+the ticket and you should resolve it again when you've made the
+changes or have a response to our feedback. When we believe the patch
+is ready to be merged, we will tag the _Code Reviewed_ field with
+_Reviewed_.
+
+Depending on the project, these tickets are then merged within a week
+or two, depending on the current release cycle.
+
+## Release Cycle
+
+The versioning for Opscode Cookbook projects is X.Y.Z.
+
+* X is a major release, which may not be fully compatible with prior
+  major releases
+* Y is a minor release, which adds both new features and bug fixes
+* Z is a patch release, which adds just bug fixes
+
+A released version of a cookbook will end in an even number, e.g.
+"1.2.4" or "0.8.0". When development for the next version of the
+cookbook begins, the "Z" patch number is incremented to the next odd
+number, however the next release of the cookbook may be a major or
+minor incrementing version.
+
+Releases of Opscode's cookbooks are usually announced on the Chef user
+mailing list. Releases of several cookbooks may be batched together
+and announced on the [Opscode Blog](http://www.opscode.com/blog).
+
+## Working with the community
+
+These resources will help you learn more about Chef and connect to
+other members of the Chef community:
+
+* [chef](http://lists.opscode.com/sympa/info/chef) and
+  [chef-dev](http://lists.opscode.com/sympa/info/chef-dev) mailing
+  lists
+* #chef and #chef-hacking IRC channels on irc.freenode.net
+* [Community Cookbook site](http://community.opscode.com)
+* [Chef wiki](http://wiki.opscode.com/display/chef)
+* Opscode Chef [product page](http://www.opscode.com/chef)
+
+
+## Cookbook Contribution Do's and Don't's
+
+Please do include tests for your contribution. If you need help, ask
+on the
+[chef-dev mailing list](http://lists.opscode.com/sympa/info/chef-dev)
+or the
+[#chef-hacking IRC channel](http://community.opscode.com/chat/chef-hacking).
+Not all platforms that a cookbook supports may be supported by Test
+Kitchen. Please provide evidence of testing your contribution if it
+isn't trivial so we don't have to duplicate effort in testing. Chef
+10.14+ "doc" formatted output is sufficient.
+
+Please do indicate new platform (families) or platform versions in the
+commit message, and update the relevant ticket.
+
+If a contribution adds new platforms or platform versions, indicate
+such in the body of the commit message(s), and update the relevant
+COOK ticket. When writing commit messages, it is helpful for others if
+you indicate the COOK ticket. For example:
+
+    git commit -m '[COOK-1041] - Updated pool resource to correctly
+    delete.'
+
+Please do use [foodcritic](http://acrmp.github.com/foodcritic) to
+lint-check the cookbook. Except FC007, it should pass all correctness
+rules. FC007 is okay as long as the dependent cookbooks are *required*
+for the default behavior of the cookbook, such as to support an
+uncommon platform, secondary recipe, etc.
+
+Please do ensure that your changes do not break or modify behavior for
+other platforms supported by the cookbook. For example if your changes
+are for Debian, make sure that they do not break on CentOS.
+
+Please do not modify the version number in the metadata.rb, Opscode
+will select the appropriate version based on the release cycle
+information above.
+
+Please do not update the CHANGELOG.md for a new version. Not all
+changes to a cookbook may be merged and released in the same versions.
+Opscode will update the CHANGELOG.md when releasing a new version of
+the cookbook.

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/Gemfile

@@ -0,0 +1,23 @@
+# source "https://rubygems.org"
+
+# gem 'cucumber', '~> 1.2.0'
+# gem 'httparty', '~> 0.8.3'
+# gem 'minitest', '~> 3.0.0'
+# gem 'nokogiri', '~> 1.5.0'
+
+# group :kitchen  do
+#   gem 'test-kitchen', '< 1.0'
+# end
+
+
+source 'https://rubygems.org'
+
+gem 'berkshelf',  '~> 2.0'
+gem 'chefspec',   '~> 2.0'
+gem 'foodcritic', '~> 3.0'
+gem 'rubocop',    '~> 0.12'
+
+group :integration do
+  gem 'test-kitchen',    '~> 1.0.0.beta'
+  gem 'kitchen-vagrant', '~> 0.11'
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/LICENSE

@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/README.md

@@ -0,0 +1,586 @@
+apache2 Cookbook
+================
+[![Build Status](https://secure.travis-ci.org/opscode-cookbooks/apache2.png?branch=master)](http://travis-ci.org/opscode-cookbooks/apache2)
+
+
+This cookbook provides a complete Debian/Ubuntu style Apache HTTPD
+configuration. Non-Debian based distributions such as Red Hat/CentOS,
+ArchLinux and others supported by this cookbook will have a
+configuration that mimics Debian/Ubuntu style as it is easier to
+manage with Chef.
+
+Debian-style Apache configuration uses scripts to manage modules and
+sites (vhosts). The scripts are:
+
+* a2ensite
+* a2dissite
+* a2enmod
+* a2dismod
+
+This cookbook ships with templates of these scripts for non
+Debian/Ubuntu platforms. The scripts are used in the __Definitions__
+below.
+
+Requirements
+============
+
+## Ohai and Chef:
+
+* Ohai: 0.6.12+
+* Chef: 0.10.10+
+
+As of v1.2.0, this cookbook makes use of `node['platform_family']` to
+simplify platform selection logic. This attribute was introduced in
+Ohai v0.6.12. The recipe methods were introduced in Chef v0.10.10. If
+you must run an older version of Chef or Ohai, use [version 1.1.16 of
+this cookbook](http://community.opscode.com/cookbooks/apache2/versions/1_1_16/downloads).
+
+## Cookbooks:
+
+This cookbook doesn't have direct dependencies on other cookbooks, as
+none are needed for the default recipe or the general use cases.
+
+Depending on your OS configuration and security policy, you may need
+additional recipes or cookbooks for this cookbook's recipes to
+converge on the node. In particular, the following Operating System
+settings may affect the behavior of this cookbook:
+
+* apt cache outdated
+* SELinux enabled
+* IPtables
+* Compile tools
+* 3rd party repositories
+
+On Ubuntu/Debian, use Opscode's `apt` cookbook to ensure the package
+cache is updated so Chef can install packages, or consider putting
+apt-get in your bootstrap process or
+[knife bootstrap template](http://wiki.opscode.com/display/chef/Knife+Bootstrap).
+
+On RHEL, SELinux is enabled by default. The `selinux` cookbook
+contains a `permissive` recipe that can be used to set SELinux to
+"Permissive" state. Otherwise, additional recipes need to be created
+by the user to address SELinux permissions.
+
+The easiest but **certainly not ideal way** to deal with IPtables is
+to flush all rules. Opscode does provide an `iptables` cookbook but is
+migrating from the approach used there to a more robust solution
+utilizing a general "firewall" LWRP that would have an "iptables"
+provider. Alternately, you can use ufw, with Opscode's `ufw` and
+`firewall` cookbooks to set up rules. See those cookbooks' READMEs for
+documentation.
+
+Build/compile tools may not be installed on the system by default.
+Some recipes (e.g., `apache2::mod_auth_openid`) build the module from
+source. Use Opscode's `build-essential` cookbook to get essential
+build packages installed.
+
+On ArchLinux, if you are using the `apache2::mod_auth_openid` recipe,
+you also need the `pacman` cookbook for the `pacman_aur` LWRP. Put
+`recipe[pacman]` on the node's expanded run list (on the node or in a
+role). This is not an explicit dependency because it is only required
+for this single recipe and platform; the pacman default recipe
+performs `pacman -Sy` to keep pacman's package cache updated.
+
+The `apache2::god_monitor` recipe uses a definition from the `god`
+cookbook. Include `recipe[god]` in the node's expanded run list to
+ensure that the cookbook is available to the node, and to set up `god`.
+
+## Platforms:
+
+The following platforms and versions are tested and supported using
+Opscode's [test-kitchen](http://github.com/opscode/test-kitchen).
+
+* Ubuntu 10.04, 12.04
+* CentOS 5.8, 6.3
+
+The following platform families are supported in the code, and are
+assumed to work based on the successful testing on Ubuntu and CentOS.
+
+* Debian
+* Red Hat (rhel)
+* Fedora
+* Amazon Linux
+
+The following platforms are also supported in the code, have been
+tested manually but are not tested under test-kitchen.
+
+* SUSE/OpenSUSE
+* ArchLinux
+* FreeBSD
+
+### Notes for RHEL Family:
+
+On Red Hat Enterprise Linux and derivatives, the EPEL repository may
+be necessary to install packages used in certain recipes. The
+`apache2::default` recipe, however, does not require any additional
+repositories. Opscode's `yum` cookbook contains a recipe to add the
+EPEL repository. See __Examples__ for more information.
+
+### Notes for FreeBSD:
+
+The `apache2::mod_php5` recipe depends on the `freebsd` cookbook,
+which it uses to set the correct options for compiling the `php5` port
+from sources. You need to ensure the `freebsd` is in the expanded run
+list, or this recipe will fail. We don't set an explicit dependency
+because we feel the `freebsd` cookbook is something users would want
+on their nodes, and due to the generality of this cookbook we don't
+want additional specific dependencies.
+
+Tests
+=====
+
+This cookbook in the
+[source repository](https://github.com/opscode-cookbooks/apache2)
+contains minitest and cucumber tests. This is an initial proof of
+concept that will be fleshed out with more supporting infrastructure
+at a future time.
+
+Please see the CONTRIBUTING file for information on how to add tests
+for your contributions.
+
+Attributes
+==========
+
+This cookbook uses many attributes, broken up into a few different
+kinds.
+
+Platform specific
+-----------------
+
+In order to support the broadest number of platforms, several
+attributes are determined based on the node's platform. See the
+attributes/default.rb file for default values in the case statement at
+the top of the file.
+
+* `node['apache']['dir']` - Location for the Apache configuration
+* `node['apache']['log_dir']` - Location for Apache logs
+* `node['apache']['error_log']` - Location for the default error log
+* `node['apache']['access_log']` - Location for the default access log
+* `node['apache']['user']` - User Apache runs as
+* `node['apache']['group']` - Group Apache runs as
+* `node['apache']['binary']` - Apache httpd server daemon
+* `node['apache']['icondir']` - Location for icons
+* `node['apache']['cache_dir']` - Location for cached files used by Apache itself or recipes
+* `node['apache']['pid_file']` - Location of the PID file for Apache httpd
+* `node['apache']['lib_dir']` - Location for shared libraries
+* `node['apache']['default_site_enabled']` - Default site enabled. Default is false.
+* `node['apache']['ext_status']` - if true, enables ExtendedStatus for `mod_status`
+
+General settings
+----------------
+
+These are general settings used in recipes and templates. Default
+values are noted.
+
+* `node['apache']['listen_addresses']` - Addresses that httpd should listen on. Default is any ("*").
+* `node['apache']['listen_ports']` - Ports that httpd should listen on. Default is port 80.
+* `node['apache']['contact']` - Value for ServerAdmin directive. Default "ops@example.com".
+* `node['apache']['timeout']` - Value for the Timeout directive. Default is 300.
+* `node['apache']['keepalive']` - Value for the KeepAlive directive. Default is On.
+* `node['apache']['keepaliverequests']` - Value for MaxKeepAliveRequests. Default is 100.
+* `node['apache']['keepalivetimeout']` - Value for the KeepAliveTimeout directive. Default is 5.
+* `node['apache']['default_modules']` - Array of module names. Can take "mod_FOO" or "FOO" as names, where FOO is the apache module, e.g. "`mod_status`" or "`status`".
+
+The modules listed in `default_modules` will be included as recipes in `recipe[apache::default]`.
+
+Prefork attributes
+------------------
+
+Prefork attributes are used for tuning the Apache HTTPD prefork MPM
+configuration.
+
+* `node['apache']['prefork']['startservers']` - initial number of server processes to start. Default is 16.
+* `node['apache']['prefork']['minspareservers']` - minimum number of spare server processes. Default 16.
+* `node['apache']['prefork']['maxspareservers']` - maximum number of spare server processes. Default 32.
+* `node['apache']['prefork']['serverlimit']` - upper limit on configurable server processes. Default 400.
+* `node['apache']['prefork']['maxclients']` - Maximum number of simultaneous connections.
+* `node['apache']['prefork']['maxrequestsperchild']` - Maximum number of request a child process will handle. Default 10000.
+
+Worker attributes
+-----------------
+
+Worker attributes are used for tuning the Apache HTTPD worker MPM
+configuration.
+
+* `node['apache']['worker']['startservers']` - Initial number of server processes to start. Default 4
+* `node['apache']['worker']['serverlimit']` - upper limit on configurable server processes. Default 16.
+* `node['apache']['worker']['maxclients']` - Maximum number of simultaneous connections. Default 1024.
+* `node['apache']['worker']['minsparethreads']` - Minimum number of spare worker threads. Default 64
+* `node['apache']['worker']['maxsparethreads']` - Maximum number of spare worker threads. Default 192.
+* `node['apache']['worker']['maxrequestsperchild']` - Maximum number of requests a child process will handle.
+
+mod\_auth\_openid attributes
+----------------------------
+
+The following attributes are in the `attributes/mod_auth_openid.rb`
+file. Like all Chef attributes files, they are loaded as well, but
+they're logistically unrelated to the others, being specific to the
+`mod_auth_openid` recipe.
+
+* `node['apache']['mod_auth_openid']['checksum']` - sha256sum of the tarball containing the source.
+* `node['apache']['mod_auth_openid']['ref']` - Any sha, tag, or branch found from https://github.com/bmuller/mod_auth_openid
+* `node['apache']['mod_auth_openid']['cache_dir']` - the cache directory is where the sqlite3 database is stored. It is separate so it can be managed as a directory resource.
+* `node['apache']['mod_auth_openid']['dblocation']` - filename of the sqlite3 database used for directive `AuthOpenIDDBLocation`, stored in the `cache_dir` by default.
+* `node['apache']['mod_auth_openid']['configure_flags']` - optional array of configure flags passed to the `./configure` step in the compilation of the module.
+
+mod\_ssl attributes
+-------------------
+
+* `node['apache']['mod_ssl']['cipher_suite']` - sets the
+  SSLCiphersuite value to the specified string. The default is
+  considered "sane" but you may need to change it for your local
+  security policy, e.g. if you have PCI-DSS requirements. Additional
+  commentary on the
+  [original pull request](https://github.com/opscode-cookbooks/apache2/pull/15#commitcomment-1605406).
+
+Recipes
+=======
+
+Most of the recipes in the cookbook are for enabling Apache modules.
+Where additional configuration or behavior is used, it is documented
+below in more detail.
+
+The following recipes merely enable the specified module: `mod_alias`,
+`mod_basic`, `mod_digest`, `mod_authn_file`, `mod_authnz_ldap`,
+`mod_authz_default`, `mod_authz_groupfile`, `mod_authz_host`,
+`mod_authz_user`, `mod_autoindex`, `mod_cgi`, `mod_dav_fs`,
+`mod_dav_svn`, `mod_deflate`, `mod_dir`, `mod_env`, `mod_expires`,
+`mod_headers`, `mod_ldap`, `mod_log_config`, `mod_mime`,
+`mod_negotiation`, `mod_proxy`, `mod_proxy_ajp`, `mod_proxy_balancer`,
+`mod_proxy_connect`, `mod_proxy_http`, `mod_python`, `mod_rewrite`,
+`mod_setenvif`, `mod_status`, `mod_wsgi`, `mod_xsendfile`.
+
+On RHEL Family distributions, certain modules ship with a config file
+with the package. The recipes here may delete those configuration
+files to ensure they don't conflict with the settings from the
+cookbook, which will use per-module configuration in
+`/etc/httpd/mods-enabled`.
+
+default
+-------
+
+The default recipe does a number of things to set up Apache HTTPd. It
+also includes a number of modules based on the attribute
+`node['apache']['default_modules']` as recipes.
+
+logrotate
+---------
+
+Logrotate adds a logrotate entry for your apache2 logs. This recipe
+requires the `logrotate` cookbook; ensure that `recipe[logrotate]` is
+in the node's expanded run list.
+
+mod\_auth\_cas
+--------------
+
+This recipe installs the proper package and enables the `auth_cas`
+module. It can install from source or package. Package is the default,
+set the attribute `node['apache']['mod_auth_cas']['from_source']` to
+true to enable source installation. Modify the version to install by
+changing the attribute
+`node['apache']['mod_auth_cas']['source_revision']`. It is a version
+tag by default, but could be master, or another tag, or branch.
+
+The module configuration is written out with the `CASCookiePath` set,
+otherwise an error loading the module may cause Apache to not start.
+
+**Note**: This recipe does not work on EL 6 platforms unless
+epel-testing repository is enabled (outside the scope of this
+cookbook), or the package version 1.0.8.1-3.el6 or higher is otherwise
+available to the system due to this bug:
+
+https://bugzilla.redhat.com/show_bug.cgi?format=multiple&id=708550
+
+mod\_auth\_openid
+-----------------
+
+**Changed via COOK-915**
+
+This recipe compiles the module from source. In addition to
+`build-essential`, some other packages are included for installation
+like the GNU C++ compiler and development headers.
+
+To use the module in your own cookbooks to authenticate systems using
+OpenIDs, specify an array of OpenIDs that are allowed to authenticate
+with the attribute `node['apache']['allowed_openids']`. Use the
+following in a vhost to protect with OpenID authentication:
+
+    AuthType OpenID require user <%= node['apache']['allowed_openids'].join(' ') %>
+    AuthOpenIDDBLocation <%= node['apache']['mod_auth_openid']['dblocation'] %>
+
+Change the DBLocation with the attribute as required; this file is in
+a different location than previous versions, see below. It should be a
+sane default for most platforms, though, see
+`attributes/mod_auth_openid.rb`.
+
+### Changes from COOK-915:
+
+* `AuthType OpenID` instead of `AuthOpenIDEnabled On`.
+* `require user` instead of `AuthOpenIDUserProgram`.
+* A bug(?) in `mod_auth_openid` causes it to segfault when attempting
+  to update the database file if the containing directory is not
+  writable by the HTTPD process owner (e.g., www-data), even if the
+  file is writable. In order to not interfere with other settings from
+  the default recipe in this cookbook, the db file is moved.
+
+mod\_fastcgi
+------------
+
+Install the fastcgi package and enable the module.
+
+Only work on Debian/Ubuntu
+
+mod\_fcgid
+----------
+
+Installs the fcgi package and enables the module. Requires EPEL on
+RHEL family.
+
+On RHEL family, this recipe will delete the fcgid.conf and on version
+6+, create the /var/run/httpd/mod_fcgid` directory, which prevents the
+emergency error:
+
+    [emerg] (2)No such file or directory: mod_fcgid: Can't create shared memory for size XX bytes
+
+mod\_php5
+--------
+
+Simply installs the appropriate package on Debian, Ubuntu and
+ArchLinux.
+
+On Red Hat family distributions including Fedora, the php.conf that
+comes with the package is removed. On RHEL platforms less than v6, the
+`php53` package is used.
+
+mod\_ssl
+--------
+
+Besides installing and enabling `mod_ssl`, this recipe will append
+port 443 to the `node['apache']['listen_ports']` attribute array and
+update the ports.conf.
+
+god\_monitor
+------------
+
+Sets up a `god` monitor for Apache. External requirements are the
+`god` and `runit` cookbooks from Opscode. When using this recipe,
+include `recipe[god]` in the node's expanded run list to ensure the
+client downloads it; `god` depends on runit so that will also be
+downloaded.
+
+**Note** This recipe is not tested under test-kitchen yet and is
+  pending fix in COOK-744.
+
+Definitions
+===========
+
+The cookbook provides a few definitions. At some point in the future
+these definitions may be refactored into lightweight resources and
+providers as suggested by
+[foodcritic rule FC015](http://acrmp.github.com/foodcritic/#FC015).
+
+apache\_conf
+------------
+
+Sets up configuration file for an Apache module from a template. The
+template should be in the same cookbook where the definition is used.
+This is used by the `apache_module` definition and is not often used
+directly.
+
+This will use a template resource to write the module's configuration
+file in the `mods-available` under the Apache configuration directory
+(`node['apache']['dir']`). This is a platform-dependent location. See
+__apache\_module__.
+
+### Parameters:
+
+* `name` - Name of the template. When used from the `apache_module`,
+  it will use the same name as the module.
+
+### Examples:
+
+Create `#{node['apache']['dir']}/mods-available/alias.conf`.
+
+    apache_conf "alias"
+
+apache\_module
+--------------
+
+Enable or disable an Apache module in
+`#{node['apache']['dir']}/mods-available` by calling `a2enmod` or
+`a2dismod` to manage the symbolic link in
+`#{node['apache']['dir']}/mods-enabled`. If the module has a
+configuration file, a template should be created in the cookbook where
+the definition is used. See __Examples__.
+
+### Parameters:
+
+* `name` - Name of the module enabled or disabled with the `a2enmod` or `a2dismod` scripts.
+* `enable` - Default true, which uses `a2enmod` to enable the module. If false, the module will be disabled with `a2dismod`.
+* `conf` - Default false. Set to true if the module has a config file, which will use `apache_conf` for the file.
+* `filename` - specify the full name of the file, e.g.
+
+### Examples:
+
+Enable the ssl module, which also has a configuration template in `templates/default/mods/ssl.conf.erb`.
+
+    apache_module "ssl" do
+      conf true
+    end
+
+Enable the php5 module, which has a different filename than the module default:
+
+    apache_module "php5" do
+      filename "libphp5.so"
+    end
+
+Disable a module:
+
+    apache_module "disabled_module" do
+      enable false
+    end
+
+See the recipes directory for many more examples of `apache_module`.
+
+apache\_site
+------------
+
+Enable or disable a VirtualHost in
+`#{node['apache']['dir']}/sites-available` by calling a2ensite or
+a2dissite to manage the symbolic link in
+`#{node['apache']['dir']}/sites-enabled`.
+
+The template for the site must be managed as a separate resource. To
+combine the template with enabling a site, see `web_app`.
+
+### Parameters:
+
+* `name` - Name of the site.
+* `enable` - Default true, which uses `a2ensite` to enable the site. If false, the site will be disabled with `a2dissite`.
+
+web\_app
+--------
+
+Manage a template resource for a VirtualHost site, and enable it with
+`apache_site`. This is commonly done for managing web applications
+such as Ruby on Rails, PHP or Django, and the default behavior
+reflects that. However it is flexible.
+
+This definition includes some recipes to make sure the system is
+configured to have Apache and some sane default modules:
+
+* `apache2`
+* `apache2::mod_rewrite`
+* `apache2::mod_deflate`
+* `apache2::mod_headers`
+
+It will then configure the template (see __Parameters__ and
+__Examples__ below), and enable or disable the site per the `enable`
+parameter.
+
+### Parameters:
+
+Current parameters used by the definition:
+
+* `name` - The name of the site. The template will be written to
+  `#{node['apache']['dir']}/sites-available/#{params['name']}.conf`
+* `cookbook` - Optional. Cookbook where the source template is. If
+  this is not defined, Chef will use the named template in the
+  cookbook where the definition is used.
+* `template` - Default `web_app.conf.erb`, source template file.
+* `enable` - Default true. Passed to the `apache_site` definition.
+
+Additional parameters can be defined when the definition is called in
+a recipe, see __Examples__.
+
+### Examples:
+
+All parameters are passed into the template. You can use whatever you
+like. The apache2 cookbook comes with a `web_app.conf.erb` template as
+an example. The following parameters are used in the template:
+
+* `server_name` - ServerName directive.
+* `server_aliases` - ServerAlias directive. Must be an array of aliases.
+* `docroot` - DocumentRoot directive.
+* `application_name` - Used in RewriteLog directive. Will be set to the `name` parameter.
+* `directory_index` - Allow overriding the default DirectoryIndex setting, optional
+* `directory_options` - Override Options on the docroot, for example to add parameters like Includes or Indexes, optional.
+* `allow_override` - Modify the AllowOverride directive on the docroot to support apps that need .htaccess to modify configuration or require authentication.
+
+To use the default web_app, for example:
+
+    web_app "my_site" do
+      server_name node['hostname']
+      server_aliases [node['fqdn'], "my-site.example.com"]
+      docroot "/srv/www/my_site"
+    end
+
+The parameters specified will be used as:
+
+* `@params[:server_name]`
+* `@params[:server_aliases]`
+* `@params[:docroot]`
+
+In the template. When you write your own, the `@` is significant.
+
+For more information about Definitions and parameters, see the
+[Chef Wiki](http://wiki.opscode.com/display/chef/Definitions)
+
+Usage
+=====
+
+Using this cookbook is relatively straightforward. Add the desired
+recipes to the run list of a node, or create a role. Depending on your
+environment, you may have multiple roles that use different recipes
+from this cookbook. Adjust any attributes as desired. For example, to
+create a basic role for web servers that provide both HTTP and HTTPS:
+
+    % cat roles/webserver.rb
+    name "webserver"
+    description "Systems that serve HTTP and HTTPS"
+    run_list(
+      "recipe[apache2]",
+      "recipe[apache2::mod_ssl]"
+    )
+    default_attributes(
+      "apache" => {
+        "listen_ports" => ["80", "443"]
+      }
+    )
+
+For examples of using the definitions in your own recipes, see their
+respective sections above.
+
+License and Authors
+===================
+
+* Author:: Adam Jacob <adam@opscode.com>
+* Author:: Joshua Timberman <joshua@opscode.com>
+* Author:: Bryan McLellan <bryanm@widemile.com>
+* Author:: Dave Esposito <esposito@espolinux.corpnet.local>
+* Author:: David Abdemoulaie <github@hobodave.com>
+* Author:: Edmund Haselwanter <edmund@haselwanter.com>
+* Author:: Eric Rochester <err8n@virginia.edu>
+* Author:: Jim Browne <jbrowne@42lines.net>
+* Author:: Matthew Kent <mkent@magoazul.com>
+* Author:: Nathen Harvey <nharvey@customink.com>
+* Author:: Ringo De Smet <ringo.de.smet@amplidata.com>
+* Author:: Sean OMeara <someara@opscode.com>
+* Author:: Seth Chisamore <schisamo@opscode.com>
+* Author:: Gilles Devaux <gilles@peerpong.com>
+
+* Copyright:: 2009-2012, Opscode, Inc
+* Copyright:: 2011, Atriso
+* Copyright:: 2011, CustomInk, LLC.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/TESTING.md

@@ -0,0 +1,53 @@
+This cookbook uses a variety of testing components:
+
+- Unit tests: [ChefSpec](https://github.com/acrmp/chefspec)
+- Integration tests: [Test Kitchen](https://github.com/opscode/test-kitchen)
+- Chef Style lints: [Foodcritic](https://github.com/acrmp/foodcritic)
+- Ruby Style lints: [Rubocop](https://github.com/bbatsov/rubocop)
+
+
+Prerequisites
+-------------
+To develop on this cookbook, you must have a sane Ruby 1.9+ environment. Given the nature of this installation process (and it's variance across multiple operating systems), we will leave this installation process to the user.
+
+You must also have `bundler` installed:
+
+    $ gem install bundler
+
+You must also have Vagrant and VirtualBox installed:
+
+- [Vagrant](https://vagrantup.com)
+- [VirtualBox](https://virtualbox.org)
+
+Once installed, you must install the `vagrant-berkshelf` plugin:
+
+    $ vagrant plugin install vagrant-berkshelf
+
+
+Development
+-----------
+1. Clone the git repository from GitHub:
+
+        $ git clone git@github.com:opscode-cookbooks/COOKBOOK.git
+
+2. Install the dependencies using bundler:
+
+        $ bundle install
+
+3. Create a branch for your changes:
+
+        $ git checkout -b my_bug_fix
+
+4. Make any changes
+5. Write tests to support those changes. It is highly recommended you write both unit and integration tests.
+6. Run the tests:
+    - `bundle exec rspec`
+    - `bundle exec foodcritic .`
+    - `bundle exec rubocop`
+    - `bundle exec kitchen test`
+
+7. Assuming the tests pass, open a Pull Request on GitHub
+8. Open a JIRA ticket for this compontent, linking the JIRA ticket to the Pull Request and visa versa.
+9. Mark the JIRA ticket as "Fix Provided"
+
+For more information, see [Opscode's Contribution Guidelines](https://wiki.opscode.com/display/chef/How+to+Contribute).

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/attributes/default.rb

@@ -0,0 +1,177 @@
+#
+# Cookbook Name:: apache2
+# Attributes:: apache
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+default['apache']['root_group'] = 'root'
+
+# Where the various parts of apache are
+case node['platform']
+when 'redhat', 'centos', 'scientific', 'fedora', 'suse', 'amazon', 'oracle'
+  default['apache']['package']     = 'httpd'
+  default['apache']['dir']         = '/etc/httpd'
+  default['apache']['log_dir']     = '/var/log/httpd'
+  default['apache']['error_log']   = 'error.log'
+  default['apache']['access_log']  = 'access.log'
+  default['apache']['user']        = 'apache'
+  default['apache']['group']       = 'apache'
+  default['apache']['binary']      = '/usr/sbin/httpd'
+  default['apache']['docroot_dir'] = '/var/www/html'
+  default['apache']['cgibin_dir']  = '/var/www/cgi-bin'
+  default['apache']['icondir']     = '/var/www/icons'
+  default['apache']['cache_dir']   = '/var/cache/httpd'
+  default['apache']['pid_file']    = if node['platform_version'].to_f >= 6
+                                       '/var/run/httpd/httpd.pid'
+                                     else
+                                       '/var/run/httpd.pid'
+                                     end
+  default['apache']['lib_dir']     = node['kernel']['machine'] =~ /^i[36]86$/ ? '/usr/lib/httpd' : '/usr/lib64/httpd'
+  default['apache']['libexecdir']  = "#{node['apache']['lib_dir']}/modules"
+  default['apache']['default_site_enabled'] = false
+when 'debian', 'ubuntu'
+  default['apache']['package']     = 'apache2'
+  default['apache']['dir']         = '/etc/apache2'
+  default['apache']['log_dir']     = '/var/log/apache2'
+  default['apache']['error_log']   = 'error.log'
+  default['apache']['access_log']  = 'access.log'
+  default['apache']['user']        = 'www-data'
+  default['apache']['group']       = 'www-data'
+  default['apache']['binary']      = '/usr/sbin/apache2'
+  default['apache']['docroot_dir'] = '/var/www'
+  default['apache']['cgibin_dir']  = '/usr/lib/cgi-bin'
+  default['apache']['icondir']     = '/usr/share/apache2/icons'
+  default['apache']['cache_dir']   = '/var/cache/apache2'
+  default['apache']['pid_file']    = '/var/run/apache2.pid'
+  default['apache']['lib_dir']     = '/usr/lib/apache2'
+  default['apache']['libexecdir']  = "#{node['apache']['lib_dir']}/modules"
+  default['apache']['default_site_enabled'] = false
+when 'arch'
+  default['apache']['package']     = 'apache'
+  default['apache']['dir']         = '/etc/httpd'
+  default['apache']['log_dir']     = '/var/log/httpd'
+  default['apache']['error_log']   = 'error.log'
+  default['apache']['access_log']  = 'access.log'
+  default['apache']['user']        = 'http'
+  default['apache']['group']       = 'http'
+  default['apache']['binary']      = '/usr/sbin/httpd'
+  default['apache']['docroot_dir'] = '/srv/http'
+  default['apache']['cgibin_dir']  = '/usr/share/httpd/cgi-bin'
+  default['apache']['icondir']     = '/usr/share/httpd/icons'
+  default['apache']['cache_dir']   = '/var/cache/httpd'
+  default['apache']['pid_file']    = '/var/run/httpd/httpd.pid'
+  default['apache']['lib_dir']     = '/usr/lib/httpd'
+  default['apache']['libexecdir']  = "#{node['apache']['lib_dir']}/modules"
+  default['apache']['default_site_enabled'] = false
+when 'freebsd'
+  default['apache']['package']     = 'apache22'
+  default['apache']['dir']         = '/usr/local/etc/apache22'
+  default['apache']['log_dir']     = '/var/log'
+  default['apache']['error_log']   = 'httpd-error.log'
+  default['apache']['access_log']  = 'httpd-access.log'
+  default['apache']['root_group']  = 'wheel'
+  default['apache']['user']        = 'www'
+  default['apache']['group']       = 'www'
+  default['apache']['binary']      = '/usr/local/sbin/httpd'
+  default['apache']['docroot_dir'] = '/usr/local/www/apache22/data'
+  default['apache']['cgibin_dir']  = '/usr/local/www/apache22/cgi-bin'
+  default['apache']['icondir']     = '/usr/local/www/apache22/icons'
+  default['apache']['cache_dir']   = '/var/run/apache22'
+  default['apache']['pid_file']    = '/var/run/httpd.pid'
+  default['apache']['lib_dir']     = '/usr/local/libexec/apache22'
+  default['apache']['libexecdir']  = node['apache']['lib_dir']
+  default['apache']['default_site_enabled'] = false
+else
+  default['apache']['dir']         = '/etc/apache2'
+  default['apache']['log_dir']     = '/var/log/apache2'
+  default['apache']['error_log']   = 'error.log'
+  default['apache']['access_log']  = 'access.log'
+  default['apache']['user']        = 'www-data'
+  default['apache']['group']       = 'www-data'
+  default['apache']['binary']      = '/usr/sbin/apache2'
+  default['apache']['docroot_dir'] = '/var/www'
+  default['apache']['cgibin_dir']  = '/usr/lib/cgi-bin'
+  default['apache']['icondir']     = '/usr/share/apache2/icons'
+  default['apache']['cache_dir']   = '/var/cache/apache2'
+  default['apache']['pid_file']    = 'logs/httpd.pid'
+  default['apache']['lib_dir']     = '/usr/lib/apache2'
+  default['apache']['libexecdir']  = "#{node['apache']['lib_dir']}/modules"
+  default['apache']['default_site_enabled'] = false
+end
+
+###
+# These settings need the unless, since we want them to be tunable,
+# and we don't want to override the tunings.
+###
+
+# General settings
+default['apache']['listen_addresses']  = %w[*]
+default['apache']['listen_ports']      = %w[80]
+default['apache']['contact']           = 'ops@example.com'
+default['apache']['timeout']           = 300
+default['apache']['keepalive']         = 'On'
+default['apache']['keepaliverequests'] = 100
+default['apache']['keepalivetimeout']  = 5
+
+# Security
+default['apache']['servertokens']    = 'Prod'
+default['apache']['serversignature'] = 'On'
+default['apache']['traceenable']     = 'On'
+
+# mod_auth_openids
+default['apache']['allowed_openids'] = []
+
+# mod_status Allow list, space seprated list of allowed entries.
+default['apache']['status_allow_list'] = 'localhost ip6-localhost'
+
+# mod_status ExtendedStatus, set to 'true' to enable
+default['apache']['ext_status'] = false
+
+# mod_info Allow list, space seprated list of allowed entries.
+default['apache']['info_allow_list'] = 'localhost ip6-localhost'
+
+# Prefork Attributes
+default['apache']['prefork']['startservers']        = 16
+default['apache']['prefork']['minspareservers']     = 16
+default['apache']['prefork']['maxspareservers']     = 32
+default['apache']['prefork']['serverlimit']         = 400
+default['apache']['prefork']['maxclients']          = 400
+default['apache']['prefork']['maxrequestsperchild'] = 10_000
+
+# Worker Attributes
+default['apache']['worker']['startservers']        = 4
+default['apache']['worker']['serverlimit']         = 16
+default['apache']['worker']['maxclients']          = 1024
+default['apache']['worker']['minsparethreads']     = 64
+default['apache']['worker']['maxsparethreads']     = 192
+default['apache']['worker']['threadsperchild']     = 64
+default['apache']['worker']['maxrequestsperchild'] = 0
+
+# mod_proxy settings
+default['apache']['proxy']['order']      = 'deny,allow'
+default['apache']['proxy']['deny_from']  = 'all'
+default['apache']['proxy']['allow_from'] = 'none'
+
+# Default modules to enable via include_recipe
+
+default['apache']['default_modules'] = %w[
+  status alias auth_basic authn_file authz_default authz_groupfile authz_host authz_user autoindex
+  dir env mime negotiation setenvif
+]
+
+%w[log_config logio].each do |log_mod|
+  default['apache']['default_modules'] << log_mod if %w[rhel fedora suse arch freebsd].include?(node['platform_family'])
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/attributes/mod_auth_cas.rb

@@ -0,0 +1,21 @@
+#
+# Cookbook Name:: apache2
+# Attributes:: mod_auth_cas
+#
+# Copyright 2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+default['apache']['mod_auth_cas']['from_source']     = false
+default['apache']['mod_auth_cas']['source_revision'] = 'v1.0.8.1'

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/attributes/mod_auth_openid.rb

@@ -0,0 +1,33 @@
+#
+# Cookbook Name:: apache2
+# Attributes:: mod_auth_cas
+#
+# Copyright 2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+default['apache']['mod_auth_openid']['ref']        = '95043901eab868400937642d9bc55d17e9dd069f'
+default['apache']['mod_auth_openid']['source_url'] = "https://github.com/bmuller/mod_auth_openid/archive/#{node['apache']['mod_auth_openid']['ref']}.tar.gz"
+default['apache']['mod_auth_openid']['cache_dir']  = '/var/cache/mod_auth_openid'
+default['apache']['mod_auth_openid']['dblocation'] = "#{node['apache']['mod_auth_openid']['cache_dir']}/mod_auth_openid.db"
+
+case node['platform_family']
+when 'freebsd'
+  default['apache']['mod_auth_openid']['configure_flags'] = [
+    'CPPFLAGS=-I/usr/local/include',
+    'LDFLAGS=-I/usr/local/lib -lsqlite3'
+  ]
+else
+  default['apache']['mod_auth_openid']['configure_flags'] = []
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/attributes/mod_fastcgi.rb

@@ -0,0 +1,20 @@
+#
+# Cookbook Name:: apache2
+# Attributes:: mod_fastcgi
+#
+# Copyright 2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+default['apache']['mod_fastcgi']['download_url'] = 'http://www.fastcgi.com/dist/mod_fastcgi-current.tar.gz'

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/attributes/mod_ssl.rb

@@ -0,0 +1,20 @@
+#
+# Cookbook Name:: apache2
+# Attributes:: mod_ssl
+#
+# Copyright 2012-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+default['apache']['mod_ssl']['cipher_suite'] = 'RC4-SHA:HIGH:!ADH'

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/definitions/apache_conf.rb

@@ -0,0 +1,26 @@
+#
+# Cookbook Name:: apache2
+# Definition:: apache_conf
+#
+# Copyright 2008-20013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+define :apache_conf do
+  template "#{node['apache']['dir']}/mods-available/#{params[:name]}.conf" do
+    source   "mods/#{params[:name]}.conf.erb"
+    mode     '0644'
+    notifies :restart, 'service[apache2]'
+  end
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/definitions/apache_module.rb

@@ -0,0 +1,51 @@
+#
+# Cookbook Name:: apache2
+# Definition:: apache_module
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+define :apache_module, :enable => true, :conf => false do
+  include_recipe 'apache2::default'
+
+  params[:filename]    = params[:filename] || "mod_#{params[:name]}.so"
+  params[:module_path] = params[:module_path] || "#{node['apache']['libexecdir']}/#{params[:filename]}"
+
+  apache_conf params[:name] if params[:conf]
+
+  if platform_family?('rhel', 'fedora', 'arch', 'suse', 'freebsd')
+    file "#{node['apache']['dir']}/mods-available/#{params[:name]}.load" do
+      content "LoadModule #{params[:name]}_module #{params[:module_path]}\n"
+      mode    '0644'
+    end
+  end
+
+  if params[:enable]
+    execute "a2enmod #{params[:name]}" do
+      command "/usr/sbin/a2enmod #{params[:name]}"
+      notifies :restart, 'service[apache2]'
+      not_if do
+        ::File.symlink?("#{node['apache']['dir']}/mods-enabled/#{params[:name]}.load") &&
+        (::File.exists?("#{node['apache']['dir']}/mods-available/#{params[:name]}.conf") ? ::File.symlink?("#{node['apache']['dir']}/mods-enabled/#{params[:name]}.conf") : true)
+      end
+    end
+  else
+    execute "a2dismod #{params[:name]}" do
+      command "/usr/sbin/a2dismod #{params[:name]}"
+      notifies :restart, 'service[apache2]'
+      only_if { ::File.symlink?("#{node['apache']['dir']}/mods-enabled/#{params[:name]}.load") }
+    end
+  end
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/definitions/apache_site.rb

@@ -0,0 +1,43 @@
+#
+# Cookbook Name:: apache2
+# Definition:: apache_site
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+define :apache_site, :enable => true do
+  include_recipe 'apache2::default'
+
+  if params[:enable]
+    execute "a2ensite #{params[:name]}" do
+      command "/usr/sbin/a2ensite #{params[:name]}"
+      notifies :restart, 'service[apache2]'
+      not_if do
+        ::File.symlink?("#{node['apache']['dir']}/sites-enabled/#{params[:name]}") ||
+        ::File.symlink?("#{node['apache']['dir']}/sites-enabled/000-#{params[:name]}")
+      end
+      only_if { ::File.exists?("#{node['apache']['dir']}/sites-available/#{params[:name]}") }
+    end
+  else
+    execute "a2dissite #{params[:name]}" do
+      command "/usr/sbin/a2dissite #{params[:name]}"
+      notifies :restart, 'service[apache2]'
+      only_if do
+        ::File.symlink?("#{node['apache']['dir']}/sites-enabled/#{params[:name]}") ||
+        ::File.symlink?("#{node['apache']['dir']}/sites-enabled/000-#{params[:name]}")
+      end
+    end
+  end
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/definitions/web_app.rb

@@ -0,0 +1,48 @@
+#
+# Cookbook Name:: apache2
+# Definition:: web_app
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+define :web_app, :template => 'web_app.conf.erb', :enable => true do
+
+  application_name = params[:name]
+
+  include_recipe 'apache2::default'
+  include_recipe 'apache2::mod_rewrite'
+  include_recipe 'apache2::mod_deflate'
+  include_recipe 'apache2::mod_headers'
+
+  template "#{node['apache']['dir']}/sites-available/#{application_name}.conf" do
+    source   params[:template]
+    owner    'root'
+    group    node['apache']['root_group']
+    mode     '0644'
+    cookbook params[:cookbook] if params[:cookbook]
+    variables(
+      :application_name => application_name,
+      :params           => params
+    )
+    if ::File.exists?("#{node['apache']['dir']}/sites-enabled/#{application_name}.conf")
+      notifies :reload, 'service[apache2]'
+    end
+  end
+
+  site_enabled = params[:enable]
+  apache_site "#{params[:name]}.conf" do
+    enable site_enabled
+  end
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/files/default/apache2_module_conf_generate.pl

@@ -0,0 +1,41 @@
+#!/usr/bin/perl
+
+=begin
+
+Generates Ubuntu style module.load files.
+
+./apache2_module_conf_generate.pl /usr/lib64/httpd/modules /etc/httpd/mods-available
+
+ARGV[0] is the apache modules directory, ARGV[1] is where you want 'em.
+
+=cut
+
+use File::Find;
+
+use strict;
+use warnings;
+
+die "Must have '/path/to/modules' and '/path/to/modules.load'"
+  unless $ARGV[0] && $ARGV[1];
+
+find(
+  {
+    wanted => sub {
+      return 1 if $File::Find::name !~ /\.so$/;
+      my $modfile = $_;
+      $modfile =~ /(lib|mod_)(.+)\.so$/;
+      my $modname  = $2;
+      my $filename = "$ARGV[1]/$modname.load";
+      unless ( -f $filename ) {
+        open( FILE, ">", $filename ) or die "Cannot open $filename";
+        print FILE "LoadModule " . $modname . "_module $File::Find::name\n";
+        close(FILE);
+      }
+    },
+    follow => 1,
+  },
+  $ARGV[0]
+);
+
+exit 0;
+

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/files/default/tests/minitest/default_test.rb

@@ -0,0 +1,76 @@
+require File.expand_path('../support/helpers', __FILE__)
+
+describe 'apache2::default' do
+  include Helpers::Apache
+
+  it 'installs apache' do
+    package(node['apache']['package']).must_be_installed
+  end
+
+  it 'starts apache' do
+    apache_service.must_be_running
+  end
+
+  it 'enables apache' do
+    apache_service.must_be_enabled
+  end
+
+  it 'creates the conf.d directory' do
+    directory("#{node['apache']['dir']}/conf.d").must_exist.with(:mode, '755')
+  end
+
+  it 'creates the logs directory' do
+    directory(node['apache']['log_dir']).must_exist
+  end
+
+  it 'enables the default site unless it is disabled' do
+    skip unless node['apache']['default_site_enabled']
+    file("#{node['apache']['dir']}/sites-enabled/000-default").must_exist
+    file("#{node['apache']['dir']}/sites-available/default").must_exist
+  end
+
+  it 'ensures the debian-style apache module scripts are present' do
+    %w{a2ensite a2dissite a2enmod a2dismod}.each do |mod_script|
+      file("/usr/sbin/#{mod_script}").must_exist
+    end
+  end
+
+  it 'reports server name only, not detailed version info' do
+    assert_match(/^ServerTokens #{node['apache']['servertokens']} *$/, File.read("#{node['apache']['dir']}/conf.d/security"))
+  end
+
+  it 'listens on port 80' do
+    apache_configured_ports.must_include(80)
+  end
+
+  it 'only listens on port 443 when SSL is enabled' do
+    unless ran_recipe?('apache2::mod_ssl')
+      apache_configured_ports.wont_include(443)
+    end
+  end
+
+  it 'reports server name only, not detailed version info' do
+    file("#{node['apache']['dir']}/conf.d/security").must_match(/^ServerTokens #{node['apache']['servertokens']} *$/)
+  end
+
+  it 'enables default_modules' do
+    node['apache']['default_modules'].each do |a2mod|
+      apache_enabled_modules.must_include "#{a2mod}_module"
+    end
+  end
+
+  describe 'centos' do
+    it 'ensures no modules are loaded in conf.d' do
+      Dir["#{node['apache']['dir']}/conf.d/*"].each do |f|
+        file(f).wont_include 'LoadModule'
+      end
+    end
+  end
+
+  describe 'configuration' do
+    it { config.must_include '# Generated by Chef' }
+    it { config.must_include %Q{ServerRoot "#{node['apache']['dir']}"} }
+    it { config.must_include "Include #{node['apache']['dir']}/conf.d/" }
+    it { apache_config_parses? }
+  end
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/files/default/tests/minitest/god_monitor_test.rb

@@ -0,0 +1,34 @@
+#
+# Author:: Joshua Timberman <joshua@opscode.com>
+# Copyright:: Copyright (c) 2012, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require File.expand_path('../support/helpers', __FILE__)
+
+describe 'apache2::god_monitor' do
+  include Helpers::Apache
+
+  it 'starts god service to supervise apache2' do
+    service('god').must_be_running
+  end
+
+  it 'creates the god service template for apache' do
+    file('/etc/god/conf.d/apache2.god').must_exist
+  end
+
+  it 'starts an apache2 service that works like a regular service' do
+    # to be implemented when COOK-744 is fixed
+  end
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/files/default/tests/minitest/mod_apreq2_test.rb

@@ -0,0 +1,19 @@
+require File.expand_path('../support/helpers', __FILE__)
+
+describe 'apache2::mod_apreq2' do
+  include Helpers::Apache
+
+  it 'enables apreq_module' do
+    apache_enabled_modules.must_include 'apreq_module'
+  end
+
+  it 'symlinks the module on EL' do
+    skip unless %w[rhel fedora].include?(node['platform_family'])
+    libdir = node['kernel']['machine'] == 'x86_64' ? 'lib64' : 'lib'
+    link(
+      "/usr/#{libdir}/httpd/modules/mod_apreq.so"
+    ).must_exist.with(
+        :link_type, :symbolic).and(:to, "/usr/#{libdir}/httpd/modules/mod_apreq2.so"
+        )
+  end
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/files/default/tests/minitest/mod_auth_cas_test.rb

@@ -0,0 +1,10 @@
+require File.expand_path('../support/helpers', __FILE__)
+
+describe 'apache2::mod_auth_cas' do
+  include Helpers::Apache
+
+  it 'enables auth_cas_module' do
+    skip if %w[rhel fedora].include?(node['platform_family']) && node['platform_version'].to_f > 6.0
+    apache_enabled_modules.must_include 'auth_cas_module'
+  end
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/files/default/tests/minitest/mod_auth_openid_test.rb

@@ -0,0 +1,36 @@
+require File.expand_path('../support/helpers', __FILE__)
+require 'pathname'
+
+describe 'apache2::mod_auth_openid' do
+  include Helpers::Apache
+
+  it 'installs the opekele library' do
+    lib_dir = Pathname.new(node['apache']['lib_dir']).dirname.to_s
+    file("#{lib_dir}/libopkele.so").must_exist
+  end
+
+  it 'does not add the module to httpd.conf' do
+    conffile = case node['platform']
+               when 'debian', 'ubuntu'
+                 'apache2.conf'
+               when 'redhat', 'centos', 'scientific', 'fedora', 'arch', 'amazon'
+                 'conf/httpd.conf'
+               when 'freebsd'
+                 'httpd.conf'
+               end
+    httpd_config = File.read(File.join(node['apache']['dir'], conffile))
+    refute_match /^LoadModule authopenid_module /, httpd_config
+  end
+
+  it 'creates a cache directory for the module' do
+    directory(node['apache']['mod_auth_openid']['cache_dir']).must_exist.with(:owner, node['apache']['user'])
+  end
+
+  it 'ensures the db file is writable by apache' do
+    file(node['apache']['mod_auth_openid']['dblocation']).must_exist.with(:owner, node['apache']['user']).and(:mode, '644')
+  end
+
+  it 'enables authopenid_module' do
+    apache_enabled_modules.must_include 'authopenid_module'
+  end
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/files/default/tests/minitest/mod_cgi_test.rb

@@ -0,0 +1,12 @@
+require File.expand_path('../support/helpers', __FILE__)
+
+describe 'apache2::mod_cgi' do
+  include Helpers::Apache
+
+  # the cgi module can be either cgi or cgid
+  it 'enables cgi or cgid_module' do
+    assert(apache_enabled_modules.include?('cgi_module') ||
+      apache_enabled_modules.include?('cgid_module')
+    )
+  end
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/files/default/tests/minitest/mod_dav_svn_test.rb

@@ -0,0 +1,13 @@
+require File.expand_path('../support/helpers', __FILE__)
+
+describe 'apache2::mod_dav_svn' do
+  include Helpers::Apache
+
+  it 'enables dav_svn_module' do
+    apache_enabled_modules.must_include('dav_svn_module')
+  end
+
+  it 'enables dav_module' do
+    apache_enabled_modules.must_include('dav_module')
+  end
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/files/default/tests/minitest/mod_fastcgi.rb

@@ -0,0 +1,10 @@
+require File.expand_path('../support/helpers', __FILE__)
+
+describe 'apache2::mod_fastcgi' do
+  include Helpers::Apache
+
+  it 'enables fastcgi_module' do
+    skip if %w{rhel fedora}.include?(node['platform_family'])
+    apache_enabled_modules.must_include 'fastcgi_module'
+  end
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/files/default/tests/minitest/mod_include_test.rb

@@ -0,0 +1,14 @@
+require File.expand_path('../support/helpers', __FILE__)
+
+describe 'apache2::mod_include' do
+  include Helpers::Apache
+
+  it 'enables include_module' do
+    apache_enabled_modules.must_include 'include_module'
+  end
+
+  it 'drops off the include module configuration' do
+    assert_match(/AddType text\/html .shtml/, File.read("#{node['apache']['dir']}/mods-enabled/include.conf"))
+    assert_match(/AddOutputFilter INCLUDES .shtml/, File.read("#{node['apache']['dir']}/mods-enabled/include.conf"))
+  end
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/files/default/tests/minitest/mod_perl_test.rb

@@ -0,0 +1,17 @@
+require File.expand_path('../support/helpers', __FILE__)
+
+describe 'apache2::mod_perl' do
+  include Helpers::Apache
+
+  it 'enables perl_module' do
+    apache_enabled_modules.must_include('perl_module')
+  end
+
+  it 'installs the apache request library' do
+    req_pkg = case node['platform']
+              when 'debian', 'ubuntu' then 'libapache2-request-perl'
+              else 'perl-libapreq2'
+              end
+    package(req_pkg).must_be_installed
+  end
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/files/default/tests/minitest/mod_php5_test.rb

@@ -0,0 +1,13 @@
+require File.expand_path('../support/helpers', __FILE__)
+
+describe 'apache2::mod_php5' do
+  include Helpers::Apache
+
+  it 'enables php5_module' do
+    apache_enabled_modules.must_include('php5_module')
+  end
+
+  it 'deletes the packaged php config if any' do
+    file("#{node['apache']['dir']}/conf.d/php.conf").wont_exist
+  end
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/files/default/tests/minitest/mod_python_test.rb

@@ -0,0 +1,9 @@
+require File.expand_path('../support/helpers', __FILE__)
+
+describe 'apache2::mod_python' do
+  include Helpers::Apache
+
+  it 'enables python_module' do
+    apache_enabled_modules.must_include('python_module')
+  end
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/files/default/tests/minitest/mod_ssl_test.rb

@@ -0,0 +1,27 @@
+require File.expand_path('../support/helpers', __FILE__)
+
+describe 'apache2::mod_ssl' do
+  include Helpers::Apache
+
+  it 'installs the mod_ssl package on RHEL distributions' do
+    skip unless %w[rhel fedora].include?(node['platform_family'])
+    package('mod_ssl').must_be_installed
+  end
+
+  it 'enables ssl_module' do
+    apache_enabled_modules.must_include 'ssl_module'
+  end
+
+  it 'does not store SSL config in conf.d' do
+    file("#{node['apache']['dir']}/conf.d/ssl.conf").wont_exist
+  end
+
+  it 'is configured to listen on port 443' do
+    apache_configured_ports.must_include(443)
+  end
+
+  it 'configures SSLCiphersuit from an attribute' do
+    assert_match(/^SSLCipherSuite #{node['apache']['mod_ssl']['cipher_suite']}$/,
+      File.read("#{node['apache']['dir']}/mods-enabled/ssl.conf"))
+  end
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/files/default/tests/minitest/support/helpers.rb

@@ -0,0 +1,66 @@
+module Helpers
+  # MiniTest helpers
+  module Apache
+    require 'chef/mixin/shell_out'
+    include Chef::Mixin::ShellOut
+    include MiniTest::Chef::Assertions
+    include MiniTest::Chef::Context
+    include MiniTest::Chef::Resources
+
+    def apache_config_parses?
+      acp = shell_out("#{node['apache']['binary']} -t")
+      acp.exitstatus == 0
+    end
+
+    def apache_configured_ports
+      port_config = File.read("#{node['apache']['dir']}/ports.conf")
+      port_config.scan(/^Listen ([0-9]+)/).flatten.map { |p| p.to_i }
+    end
+
+    def apache_enabled_modules
+      apache_modules = shell_out("#{node['apache']['binary']} -M")
+      apache_modules.send(
+        if node['platform_family'] == 'rhel' && node['platform_version'].to_f < 6.0
+          :stderr
+        else
+          :stdout
+        end
+      ).split.select! { |i| i =~ /_module$/ }
+    end
+
+    def apache_service
+      service(
+        case node['platform']
+        when 'debian', 'ubuntu' then 'apache2'
+        when 'freebsd' then 'apache22'
+        else 'httpd'
+        end
+      )
+    end
+
+    def config
+      file(
+        case node['platform']
+        when 'debian', 'ubuntu' then "#{node['apache']['dir']}/apache2.conf"
+        when 'freebsd' then "#{node['apache']['dir']}/httpd.conf"
+        else "#{node['apache']['dir']}/conf/httpd.conf"
+        end
+      )
+    end
+
+    def ran_recipe?(recipe)
+      if Chef::VERSION < '11.0'
+        seen_recipes = node.run_state[:seen_recipes]
+        recipes = seen_recipes.keys.each { |i| i }
+      else
+        recipes = run_context.loaded_recipes
+      end
+      if recipes.empty? && Chef::Config[:solo]
+        # If you have roles listed in your run list they are NOT expanded
+        recipes = node.run_list.map { |item| item.name if item.type == :recipe }
+      end
+      recipes.include?(recipe)
+    end
+
+  end
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/metadata.rb

@@ -0,0 +1,225 @@
+name              'apache2'
+maintainer        'Opscode, Inc.'
+maintainer_email  'cookbooks@opscode.com'
+license           'Apache 2.0'
+description       'Installs and configures all aspects of apache2 using Debian style symlinks with helper definitions'
+long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version           '1.8.5'
+recipe            'apache2', 'Main Apache configuration'
+recipe            'apache2::logrotate', 'Rotate apache2 logs. Requires logrotate cookbook'
+recipe            'apache2::mod_alias', 'Apache module "alias" with config file'
+recipe            'apache2::mod_apreq2', 'Apache module "apreq"'
+recipe            'apache2::mod_auth_basic', 'Apache module "auth_basic"'
+recipe            'apache2::mod_auth_digest', 'Apache module "auth_digest"'
+recipe            'apache2::mod_auth_openid', 'Apache module "authopenid"'
+recipe            'apache2::mod_authn_file', 'Apache module "authn_file"'
+recipe            'apache2::mod_authnz_ldap', 'Apache module "authnz_ldap"'
+recipe            'apache2::mod_authz_default', 'Apache module "authz_default"'
+recipe            'apache2::mod_authz_groupfile', 'Apache module "authz_groupfile"'
+recipe            'apache2::mod_authz_host', 'Apache module "authz_host"'
+recipe            'apache2::mod_authz_user', 'Apache module "authz_user"'
+recipe            'apache2::mod_autoindex', 'Apache module "autoindex" with config file'
+recipe            'apache2::mod_cgi', 'Apache module "cgi"'
+recipe            'apache2::mod_dav', 'Apache module "dav"'
+recipe            'apache2::mod_dav_svn', 'Apache module "dav_svn"'
+recipe            'apache2::mod_deflate', 'Apache module "deflate" with config file'
+recipe            'apache2::mod_dir', 'Apache module "dir" with config file'
+recipe            'apache2::mod_env', 'Apache module "env"'
+recipe            'apache2::mod_expires', 'Apache module "expires"'
+recipe            'apache2::mod_fcgid', 'Apache module "fcgid", package on ubuntu/debian, rhel/centos, compile source on suse; with config file'
+recipe            'apache2::mod_headers', 'Apache module "headers"'
+recipe            'apache2::mod_include', 'Apache module "include"'
+recipe            'apache2::mod_ldap', 'Apache module "ldap"'
+recipe            'apache2::mod_log_config', 'Apache module "log_config"'
+recipe            'apache2::mod_mime', 'Apache module "mime" with config file'
+recipe            'apache2::mod_negotiation', 'Apache module "negotiation" with config file'
+recipe            'apache2::mod_perl', 'Apache module "perl"'
+recipe            'apache2::mod_php5', 'Apache module "php5"'
+recipe            'apache2::mod_proxy', 'Apache module "proxy" with config file'
+recipe            'apache2::mod_proxy_ajp', 'Apache module "proxy_ajp"'
+recipe            'apache2::mod_proxy_balancer', 'Apache module "proxy_balancer"'
+recipe            'apache2::mod_proxy_connect', 'Apache module "proxy_connect"'
+recipe            'apache2::mod_proxy_http', 'Apache module "proxy_http"'
+recipe            'apache2::mod_python', 'Apache module "python"'
+recipe            'apache2::mod_rewrite', 'Apache module "rewrite"'
+recipe            'apache2::mod_setenvif', 'Apache module "setenvif" with config file'
+recipe            'apache2::mod_ssl', 'Apache module "ssl" with config file, adds port 443 to listen_ports'
+recipe            'apache2::mod_status', 'Apache module "status" with config file'
+recipe            'apache2::mod_xsendfile', 'Apache module "xsendfile"'
+
+supports 'amazon'
+supports 'arch'
+supports 'centos'
+supports 'debian'
+supports 'fedora'
+supports 'freebsd'
+supports 'redhat'
+supports 'scientific'
+supports 'ubuntu'
+
+attribute 'apache',
+          :display_name => 'Apache Hash',
+          :description  => 'Hash of Apache attributes',
+          :type         => 'hash'
+
+attribute 'apache/dir',
+          :display_name => 'Apache Directory',
+          :description  => 'Location for Apache configuration',
+          :default      => '/etc/apache2'
+
+attribute 'apache/log_dir',
+          :display_name => 'Apache Log Directory',
+          :description  => 'Location for Apache logs',
+          :default      => '/etc/apache2'
+
+attribute 'apache/user',
+          :display_name => 'Apache User',
+          :description  => 'User Apache runs as',
+          :default      => 'www-data'
+
+attribute 'apache/binary',
+          :display_name => 'Apache Binary',
+          :description  => 'Apache server daemon program',
+          :default      => '/usr/sbin/apache2'
+
+attribute 'apache/icondir',
+          :display_name => 'Apache Icondir',
+          :description  => 'Directory location for icons',
+          :default      => '/usr/share/apache2/icons'
+
+attribute 'apache/listen_addresses',
+          :display_name => 'Apache Listen Addresses',
+          :description  => 'Addresses that Apache should listen on',
+          :type         => 'array',
+          :default      => %w[*]
+
+attribute 'apache/listen_ports',
+          :display_name => 'Apache Listen Ports',
+          :description  => 'Ports that Apache should listen on',
+          :type         => 'array',
+          :default      => %w[80 443]
+
+attribute 'apache/contact',
+          :display_name => 'Apache Contact',
+          :description  => 'Email address of webmaster',
+          :default      => 'ops@example.com'
+
+attribute 'apache/timeout',
+          :display_name => 'Apache Timeout',
+          :description  => 'Connection timeout value',
+          :default      => '300'
+
+attribute 'apache/keepalive',
+          :display_name => 'Apache Keepalive',
+          :description  => 'HTTP persistent connections',
+          :default      => 'On'
+
+attribute 'apache/keepaliverequests',
+          :display_name => 'Apache Keepalive Requests',
+          :description  => 'Number of requests allowed on a persistent connection',
+          :default      => '100'
+
+attribute 'apache/keepalivetimeout',
+          :display_name => 'Apache Keepalive Timeout',
+          :description  => 'Time to wait for requests on persistent connection',
+          :default      => '5'
+
+attribute 'apache/servertokens',
+          :display_name => 'Apache Server Tokens',
+          :description  => 'Server response header',
+          :default      => 'Prod'
+
+attribute 'apache/serversignature',
+          :display_name => 'Apache Server Signature',
+          :description  => 'Configure footer on server-generated documents',
+          :default      => 'On'
+
+attribute 'apache/traceenable',
+          :display_name => 'Apache Trace Enable',
+          :description  => 'Determine behavior of TRACE requests',
+          :default      => 'On'
+
+attribute 'apache/allowed_openids',
+          :display_name => 'Apache Allowed OpenIDs',
+          :description  => 'Array of OpenIDs allowed to authenticate',
+          :default      => ''
+
+attribute 'apache/prefork',
+          :display_name => 'Apache Prefork',
+          :description  => 'Hash of Apache prefork tuning attributes.',
+          :type         => 'hash'
+
+attribute 'apache/prefork/startservers',
+          :display_name => 'Apache Prefork MPM StartServers',
+          :description  => 'Number of MPM servers to start',
+          :default      => '16'
+
+attribute 'apache/prefork/minspareservers',
+          :display_name => 'Apache Prefork MPM MinSpareServers',
+          :description  => 'Minimum number of spare server processes',
+          :default      => '16'
+
+attribute 'apache/prefork/maxspareservers',
+          :display_name => 'Apache Prefork MPM MaxSpareServers',
+          :description  => 'Maximum number of spare server processes',
+          :default      => '32'
+
+attribute 'apache/prefork/serverlimit',
+          :display_name => 'Apache Prefork MPM ServerLimit',
+          :description  => 'Upper limit on configurable server processes',
+          :default      => '400'
+
+attribute 'apache/prefork/maxclients',
+          :display_name => 'Apache Prefork MPM MaxClients',
+          :description  => 'Maximum number of simultaneous connections',
+          :default      => '400'
+
+attribute 'apache/prefork/maxrequestsperchild',
+          :display_name => 'Apache Prefork MPM MaxRequestsPerChild',
+          :description  => 'Maximum number of request a child process will handle',
+          :default      => '10000'
+
+attribute 'apache/worker',
+          :display_name => 'Apache Worker',
+          :description  => 'Hash of Apache prefork tuning attributes.',
+          :type         => 'hash'
+
+attribute 'apache/worker/startservers',
+          :display_name => 'Apache Worker MPM StartServers',
+          :description  => 'Initial number of server processes to start',
+          :default      => '4'
+
+attribute 'apache/worker/maxclients',
+          :display_name => 'Apache Worker MPM MaxClients',
+          :description  => 'Maximum number of simultaneous connections',
+          :default      => '1024'
+
+attribute 'apache/worker/minsparethreads',
+          :display_name => 'Apache Worker MPM MinSpareThreads',
+          :description  => 'Minimum number of spare worker threads',
+          :default      => '64'
+
+attribute 'apache/worker/maxsparethreads',
+          :display_name => 'Apache Worker MPM MaxSpareThreads',
+          :description  => 'Maximum number of spare worker threads',
+          :default      => '192'
+
+attribute 'apache/worker/threadsperchild',
+          :display_name => 'Apache Worker MPM ThreadsPerChild',
+          :description  => 'Constant number of worker threads in each server process',
+          :default      => '64'
+
+attribute 'apache/worker/maxrequestsperchild',
+          :display_name => 'Apache Worker MPM MaxRequestsPerChild',
+          :description  => 'Maximum number of request a child process will handle',
+          :default      => '0'
+
+attribute 'apache/default_modules',
+          :display_name => 'Apache Default Modules',
+          :description  => 'Default modules to enable via recipes',
+          :default      => 'status alias auth_basic authn_file authz_default authz_groupfile authz_host authz_user autoindex dir env mime negotiation setenvif'
+
+attribute 'apache/mod_ssl/cipher_suite',
+          :display_name => 'Apache mod_ssl Cipher Suite',
+          :description  => 'String of SSL ciphers to use for SSLCipherSuite',
+          :default      => 'RC4-SHA:HIGH:!ADH'

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/default.rb

@@ -0,0 +1,212 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: default
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+package 'apache2' do
+  package_name node['apache']['package']
+end
+
+service 'apache2' do
+  case node['platform_family']
+  when 'rhel', 'fedora', 'suse'
+    service_name 'httpd'
+    # If restarted/reloaded too quickly httpd has a habit of failing.
+    # This may happen with multiple recipes notifying apache to restart - like
+    # during the initial bootstrap.
+    restart_command '/sbin/service httpd restart && sleep 1'
+    reload_command '/sbin/service httpd reload && sleep 1'
+  when 'debian'
+    service_name 'apache2'
+    restart_command '/usr/sbin/invoke-rc.d apache2 restart && sleep 1'
+    reload_command '/usr/sbin/invoke-rc.d apache2 reload && sleep 1'
+  when 'arch'
+    service_name 'httpd'
+  when 'freebsd'
+    service_name 'apache22'
+  end
+  supports [:restart, :reload, :status]
+  action :enable
+end
+
+if platform_family?('rhel', 'fedora', 'arch', 'suse', 'freebsd')
+  directory node['apache']['log_dir'] do
+    mode '0755'
+  end
+
+  package 'perl'
+
+  cookbook_file '/usr/local/bin/apache2_module_conf_generate.pl' do
+    source 'apache2_module_conf_generate.pl'
+    mode   '0755'
+    owner  'root'
+    group  node['apache']['root_group']
+  end
+
+  %w[sites-available sites-enabled mods-available mods-enabled].each do |dir|
+    directory "#{node['apache']['dir']}/#{dir}" do
+      mode  '0755'
+      owner 'root'
+      group node['apache']['root_group']
+    end
+  end
+
+  execute 'generate-module-list' do
+    command "/usr/local/bin/apache2_module_conf_generate.pl #{node['apache']['lib_dir']} #{node['apache']['dir']}/mods-available"
+    action  :nothing
+  end
+
+  %w[a2ensite a2dissite a2enmod a2dismod].each do |modscript|
+    template "/usr/sbin/#{modscript}" do
+      source "#{modscript}.erb"
+      mode  '0700'
+      owner 'root'
+      group node['apache']['root_group']
+    end
+  end
+
+  # installed by default on centos/rhel, remove in favour of mods-enabled
+  %w[proxy_ajp auth_pam authz_ldap webalizer ssl welcome].each do |f|
+    file "#{node['apache']['dir']}/conf.d/#{f}.conf" do
+      action :delete
+      backup false
+    end
+  end
+
+  # installed by default on centos/rhel, remove in favour of mods-enabled
+  file "#{node['apache']['dir']}/conf.d/README" do
+    action :delete
+    backup false
+  end
+
+  # enable mod_deflate for consistency across distributions
+  include_recipe 'apache2::mod_deflate'
+end
+
+if platform_family?('freebsd')
+  file "#{node['apache']['dir']}/Includes/no-accf.conf" do
+    action :delete
+    backup false
+  end
+
+  directory "#{node['apache']['dir']}/Includes" do
+    action :delete
+  end
+
+  %w[
+      httpd-autoindex.conf httpd-dav.conf httpd-default.conf httpd-info.conf
+      httpd-languages.conf httpd-manual.conf httpd-mpm.conf
+      httpd-multilang-errordoc.conf httpd-ssl.conf httpd-userdir.conf
+      httpd-vhosts.conf
+  ].each do |f|
+    file "#{node['apache']['dir']}/extra/#{f}" do
+      action :delete
+      backup false
+    end
+  end
+
+  directory "#{node['apache']['dir']}/extra" do
+    action :delete
+  end
+end
+
+%W[
+  #{node['apache']['dir']}/ssl
+  #{node['apache']['dir']}/conf.d
+  #{node['apache']['cache_dir']}
+].each do |path|
+  directory path do
+    mode  '0755'
+    owner 'root'
+    group node['apache']['root_group']
+  end
+end
+
+# Set the preferred execution binary - prefork or worker
+template '/etc/sysconfig/httpd' do
+  source   'etc-sysconfig-httpd.erb'
+  owner    'root'
+  group    node['apache']['root_group']
+  mode     '0644'
+  notifies :restart, 'service[apache2]'
+  only_if  { platform_family?('rhel', 'fedora') }
+end
+
+template 'apache2.conf' do
+  case node['platform_family']
+  when 'rhel', 'fedora', 'arch'
+    path "#{node['apache']['dir']}/conf/httpd.conf"
+  when 'debian'
+    path "#{node['apache']['dir']}/apache2.conf"
+  when 'freebsd'
+    path "#{node['apache']['dir']}/httpd.conf"
+  end
+  source   'apache2.conf.erb'
+  owner    'root'
+  group    node['apache']['root_group']
+  mode     '0644'
+  notifies :restart, 'service[apache2]'
+end
+
+template 'apache2-conf-security' do
+  path     "#{node['apache']['dir']}/conf.d/security.conf"
+  source   'security.erb'
+  owner    'root'
+  group    node['apache']['root_group']
+  mode     '0644'
+  backup   false
+  notifies :restart, 'service[apache2]'
+end
+
+template 'apache2-conf-charset' do
+  path      "#{node['apache']['dir']}/conf.d/charset.conf"
+  source   'charset.erb'
+  owner    'root'
+  group    node['apache']['root_group']
+  mode     '0644'
+  backup   false
+  notifies :restart, 'service[apache2]'
+end
+
+template "#{node['apache']['dir']}/ports.conf" do
+  source   'ports.conf.erb'
+  owner    'root'
+  group    node['apache']['root_group']
+  mode     '0644'
+  notifies :restart, 'service[apache2]'
+end
+
+template "#{node['apache']['dir']}/sites-available/default" do
+  source   'default-site.erb'
+  owner    'root'
+  group    node['apache']['root_group']
+  mode     '0644'
+  notifies :restart, 'service[apache2]'
+end
+
+node['apache']['default_modules'].each do |mod|
+  module_recipe_name = mod =~ /^mod_/ ? mod : "mod_#{mod}"
+  include_recipe "apache2::#{module_recipe_name}"
+end
+
+apache_site 'default' do
+  enable node['apache']['default_site_enabled']
+end
+
+service 'apache2' do
+  action :start
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/god_monitor.rb

@@ -0,0 +1,33 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: god_monitor
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_service = service 'apache2' do
+  action :nothing
+end
+
+start_command   = apache_service.start_command
+stop_command    = apache_service.stop_command
+restart_command = apache_service.restart_command
+
+god_monitor 'apache2' do
+  config 'apache2.god.erb'
+  start   start_command   || "/etc/init.d/#{apache_service.service_name} start"
+  restart restart_command || "/etc/init.d/#{apache_service.service_name} restart"
+  stop    stop_command    || "/etc/init.d/#{apache_service.service_name} stop"
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/iptables.rb

@@ -0,0 +1,20 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: iptables
+#
+# Copyright 2012-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+iptables_rule 'port_apache'

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/logrotate.rb

@@ -0,0 +1,31 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: logrotate
+#
+# Copyright 2012, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_service = service 'apache2' do
+  action :nothing
+end
+
+begin
+  include_recipe 'logrotate'
+rescue
+  Chef::Log.warn('The apache::logrotate recipe requires the logrotate cookbook. Install the cookbook with `knife cookbook site install logrotate`.')
+end
+logrotate_app apache_service.service_name do
+  path node['apache']['log_dir']
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_actions.rb

@@ -0,0 +1,20 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: actions
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'actions'

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_alias.rb

@@ -0,0 +1,22 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: alias
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'alias' do
+  conf true
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_apreq2.rb

@@ -0,0 +1,51 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: apreq2
+#
+# modified from the python recipe by Jeremy Bingham
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+include_recipe 'apache2::default'
+
+case node['platform_family']
+when 'debian'
+  package 'libapache2-mod-apreq2'
+when 'rhel', 'fedora'
+  package 'libapreq2' do
+    notifies :run, 'execute[generate-module-list]', :immediately
+  end
+
+  # seems that the apreq lib is weirdly broken or something - it needs to be
+  # loaded as 'apreq', but on RHEL & derivitatives the file needs a symbolic
+  # link to mod_apreq.so.
+  link '/usr/lib64/httpd/modules/mod_apreq.so' do
+    to      '/usr/lib64/httpd/modules/mod_apreq2.so'
+    only_if 'test -f /usr/lib64/httpd/modules/mod_apreq2.so'
+  end
+
+  link '/usr/lib/httpd/modules/mod_apreq.so' do
+    to      '/usr/lib/httpd/modules/mod_apreq2.so'
+    only_if 'test -f /usr/lib/httpd/modules/mod_apreq2.so'
+  end
+end
+
+file "#{node['apache']['dir']}/conf.d/apreq.conf" do
+  action :delete
+  backup false
+end
+
+apache_module 'apreq'

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_auth_basic.rb

@@ -0,0 +1,20 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: auth_basic
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'auth_basic'

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_auth_cas.rb

@@ -0,0 +1,73 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: auth_basic
+#
+# Copyright 2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+include_recipe 'apache2::default'
+
+if node['apache']['mod_auth_cas']['from_source']
+  package 'httpd-devel' do
+    package_name value_for_platform_family(
+      %w[rhel fedora suse] => 'httpd-devel',
+      'debian' => 'apache2-dev'
+    )
+  end
+
+  git '/tmp/mod_auth_cas' do
+    repository 'git://github.com/Jasig/mod_auth_cas.git'
+    revision   node['apache']['mod_auth_cas']['source_revision']
+    notifies   :run, 'execute[compile mod_auth_cas]', :immediately
+  end
+
+  execute 'compile mod_auth_cas' do
+    command './configure && make && make install'
+    cwd     '/tmp/mod_auth_cas'
+    not_if  "test -f #{node['apache']['libexecdir']}/mod_auth_cas.so"
+  end
+
+  template "#{node['apache']['dir']}/mods-available/auth_cas.load" do
+    source 'mods/auth_cas.load.erb'
+    owner  'root'
+    group  node['apache']['root_group']
+    mode   '0644'
+  end
+else
+  case node['platform_family']
+  when 'debian'
+    package 'libapache2-mod-auth-cas'
+
+  when 'rhel', 'fedora'
+    yum_package 'mod_auth_cas' do
+      notifies :run, 'execute[generate-module-list]', :immediately
+    end
+
+    file "#{node['apache']['dir']}/conf.d/auth_cas.conf" do
+      action :delete
+      backup false
+    end
+  end
+end
+
+apache_module 'auth_cas' do
+  conf true
+end
+
+directory "#{node['apache']['cache_dir']}/mod_auth_cas" do
+  owner node['apache']['user']
+  group node['apache']['group']
+  mode  '0700'
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_auth_digest.rb

@@ -0,0 +1,20 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: auth_digest
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'auth_digest'

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_auth_openid.rb

@@ -0,0 +1,123 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: mod_auth_openid
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+openid_dev_pkgs = value_for_platform_family(
+  'debian'        => %w[automake make g++ apache2-prefork-dev libopkele-dev libopkele3 libtool],
+  %w[rhel fedora] => %w[gcc-c++ httpd-devel curl-devel libtidy libtidy-devel sqlite-devel pcre-devel openssl-devel make libtool],
+  'arch'          => %w[libopkele],
+  'freebsd'       => %w[libopkele pcre sqlite3]
+)
+
+make_cmd = value_for_platform_family(
+  'freebsd' => { 'default' => 'gmake' },
+  'default' => 'make'
+)
+
+case node['platform_family']
+when 'arch'
+  include_recipe 'pacman::default'
+
+  package 'tidyhtml'
+
+  pacman_aur openid_dev_pkgs.first do
+    action [:build, :install]
+  end
+else
+  openid_dev_pkgs.each do |pkg|
+    package pkg
+  end
+end
+
+case node['platform_family']
+when 'rhel', 'fedora'
+  remote_file "#{Chef::Config['file_cache_path']}/libopkele-2.0.4.tar.gz" do
+    source   'http://kin.klever.net/dist/libopkele-2.0.4.tar.gz'
+    mode     '0644'
+    checksum '57a5bc753b7e80c5ece1e5968b2051b0ce7ed9ce4329d17122c61575a9ea7648'
+  end
+
+  bash 'install libopkele' do
+    cwd Chef::Config['file_cache_path']
+    # Ruby 1.8.6 does not have rpartition, unfortunately
+    syslibdir = node['apache']['lib_dir'][0..node['apache']['lib_dir'].rindex('/')]
+    code <<-EOH
+    tar zxvf libopkele-2.0.4.tar.gz
+    cd libopkele-2.0.4 && ./configure --prefix=/usr --libdir=#{syslibdir}
+    #{make_cmd} && #{make_cmd} install
+    EOH
+    creates "#{syslibdir}/libopkele.a"
+  end
+end
+
+version = node['apache']['mod_auth_openid']['ref']
+configure_flags = node['apache']['mod_auth_openid']['configure_flags']
+
+remote_file "#{Chef::Config['file_cache_path']}/mod_auth_openid-#{version}.tar.gz" do
+  source node['apache']['mod_auth_openid']['source_url']
+  mode   '0644'
+  action :create_if_missing
+end
+
+directory node['apache']['mod_auth_openid']['cache_dir'] do
+  owner node['apache']['user']
+  group node['apache']['group']
+  mode  '0700'
+end
+
+bash 'untar mod_auth_openid' do
+  cwd Chef::Config['file_cache_path']
+  code <<-EOH
+  tar zxvf mod_auth_openid-#{version}.tar.gz
+  EOH
+  creates "#{Chef::Config['file_cache_path']}/mod_auth_openid-#{version}/src/types.h"
+end
+
+bash 'compile mod_auth_openid' do
+  cwd "#{Chef::Config['file_cache_path']}/mod_auth_openid-#{version}"
+  code <<-EOH
+  ./autogen.sh
+  ./configure #{configure_flags.join(' ')}
+  perl -pi -e "s/-i -a -n 'authopenid'/-i -n 'authopenid'/g" Makefile
+  #{make_cmd}
+  EOH
+  creates "#{Chef::Config['file_cache_path']}/mod_auth_openid-#{version}/src/.libs/mod_auth_openid.so"
+  notifies :run, 'bash[install-mod_auth_openid]', :immediately
+  not_if "test -f #{Chef::Config['file_cache_path']}/mod_auth_openid-#{version}/src/.libs/mod_auth_openid.so"
+end
+
+bash 'install-mod_auth_openid' do
+  cwd "#{Chef::Config['file_cache_path']}/mod_auth_openid-#{version}"
+  code <<-EOH
+  #{make_cmd} install
+  EOH
+  creates "#{node['apache']['libexecdir']}/mod_auth_openid.so"
+  notifies :restart, 'service[apache2]'
+  not_if "test -f #{node['apache']['libexecdir']}/mod_auth_openid.so"
+end
+
+template "#{node['apache']['dir']}/mods-available/authopenid.load" do
+  source 'mods/authopenid.load.erb'
+  owner  'root'
+  group  node['apache']['root_group']
+  mode   '0644'
+end
+
+apache_module 'authopenid' do
+  filename 'mod_auth_openid.so'
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_authn_file.rb

@@ -0,0 +1,20 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: authn_file
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'authn_file'

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_authnz_ldap.rb

@@ -0,0 +1,20 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: authnz_ldap
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'authnz_ldap'

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_authz_default.rb

@@ -0,0 +1,20 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: authz_default
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'authz_default'

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_authz_groupfile.rb

@@ -0,0 +1,20 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: authz_groupfile
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'authz_groupfile'

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_authz_host.rb

@@ -0,0 +1,20 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: authz_host
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'authz_host'

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_authz_user.rb

@@ -0,0 +1,20 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: authz_user
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'authz_user'

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_autoindex.rb

@@ -0,0 +1,22 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: autoindex
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'autoindex' do
+  conf true
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_cgi.rb

@@ -0,0 +1,20 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: cgi
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'cgi'

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_cloudflare.rb

@@ -0,0 +1,30 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: cloudflare
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apt_repository 'cloudflare' do
+  uri          'http://pkg.cloudflare.com'
+  distribution node['lsb']['codename']
+  components   ['main']
+  key          'http://pkg.cloudflare.com/pubkey.gpg'
+  action       :add
+end
+
+package 'libapache2-mod-cloudflare' do
+  notifies :restart, 'service[apache2]'
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_dav.rb

@@ -0,0 +1,20 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: dav
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'dav'

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_dav_fs.rb

@@ -0,0 +1,21 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: dav_fs
+#
+# Copyright 2011-2013, Atriso
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+include_recipe 'apache2::mod_dav'
+apache_module 'dav_fs'

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_dav_svn.rb

@@ -0,0 +1,39 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: dav_svn
+#
+# Copyright 2008-2009, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+include_recipe 'apache2::mod_dav'
+
+package 'libapache2-svn' do
+  case node['platform_family']
+  when 'rhel', 'fedora', 'suse'
+    package_name 'mod_dav_svn'
+  else
+    package_name 'libapache2-svn'
+  end
+end
+
+case node['platform_family']
+when 'rhel', 'fedora', 'suse'
+  file "#{node['apache']['dir']}/conf.d/subversion.conf" do
+    action :delete
+    backup false
+  end
+end
+
+apache_module 'dav_svn'

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_deflate.rb

@@ -0,0 +1,22 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: deflate
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'deflate' do
+  conf true
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_dir.rb

@@ -0,0 +1,22 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: dir
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'dir' do
+  conf true
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_env.rb

@@ -0,0 +1,20 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: env
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'env'

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_expires.rb

@@ -0,0 +1,20 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: expires
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'expires'

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_fastcgi.rb

@@ -0,0 +1,52 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: fastcgi
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+if platform_family?('debian')
+  package 'libapache2-mod-fastcgi'
+elsif platform_family?('rhel')
+  %w[gcc make libtool httpd-devel apr-devel apr].each do |package|
+    yum_package package do
+      action :upgrade
+    end
+  end
+
+  src_filepath  = "#{Chef::Config['file_cache_path']}/fastcgi.tar.gz"
+  remote_file 'download fastcgi source' do
+    source node['apache']['mod_fastcgi']['download_url']
+    path   src_filepath
+    backup false
+  end
+
+  top_dir = node['apache']['lib_dir']
+  bash 'compile fastcgi source' do
+    notifies :run, 'execute[generate-module-list]', :immediately
+    not_if   "test -f #{node['apache']['dir']}/mods-available/fastcgi.conf"
+    cwd      ::File.dirname(src_filepath)
+    code <<-EOH
+      tar zxf #{::File.basename(src_filepath)} &&
+      cd mod_fastcgi-* &&
+      cp Makefile.AP2 Makefile &&
+      make top_dir=#{top_dir} && make install top_dir=#{top_dir}
+    EOH
+  end
+end
+
+apache_module 'fastcgi' do
+  conf true
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_fcgid.rb

@@ -0,0 +1,53 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: fcgid
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+if platform_family?('debian')
+  package 'libapache2-mod-fcgid'
+elsif platform_family?('rhel', 'fedora')
+  package 'mod_fcgid' do
+    notifies :run, 'execute[generate-module-list]', :immediately
+  end
+
+  file "#{node['apache']['dir']}/conf.d/fcgid.conf" do
+    action :delete
+    backup false
+  end
+
+  directory '/var/run/httpd/mod_fcgid' do
+    recursive true
+    only_if { node['platform_version'].to_i >= 6 }
+  end
+elsif platform_family?('suse')
+  apache_lib_path = node['apache']['lib_dir']
+
+  package 'httpd-devel'
+
+  bash 'install-fcgid' do
+    code <<-EOH
+(cd #{Chef::Config['file_cache_path']}; wget http://superb-east.dl.sourceforge.net/sourceforge/mod-fcgid/mod_fcgid.2.2.tgz)
+(cd #{Chef::Config['file_cache_path']}; tar zxvf mod_fcgid.2.2.tgz)
+(cd #{Chef::Config['file_cache_path']}; perl -pi -e 's!/usr/local/apache2!#{apache_lib_path}!g' ./mod_fcgid.2.2/Makefile)
+(cd #{Chef::Config['file_cache_path']}/mod_fcgid.2.2; make install)
+EOH
+  end
+end
+
+apache_module 'fcgid' do
+  conf true
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_filter.rb

@@ -0,0 +1,20 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: filter
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'filter'

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_headers.rb

@@ -0,0 +1,20 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: headers
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'headers'

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_include.rb

@@ -0,0 +1,22 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: include
+#
+# Copyright 2012-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'include' do
+  conf true
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_info.rb

@@ -0,0 +1,22 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: info
+#
+# Copyright 2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'info' do
+  conf true
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_ldap.rb

@@ -0,0 +1,20 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: ldap
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'ldap'

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_log_config.rb

@@ -0,0 +1,24 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: log_config
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+if platform_family?('rhel', 'fedora', 'suse', 'arch', 'freebsd')
+  apache_module 'log_config'
+else
+  include_recipe 'apache2::default'
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_logio.rb

@@ -0,0 +1,24 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: logio
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+if platform_family?('rhel', 'fedora', 'suse', 'arch', 'freebsd')
+  apache_module 'logio'
+else
+  include_recipe 'apache2::default'
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_mime.rb

@@ -0,0 +1,22 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: mime
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'mime' do
+  conf true
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_negotiation.rb

@@ -0,0 +1,22 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: negotiation
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'negotiation' do
+  conf true
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_perl.rb

@@ -0,0 +1,40 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: perl
+#
+# adapted from the mod_python recipe by Jeremy Bingham
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+case node['platform_family']
+when 'debian'
+  %w[libapache2-mod-perl2 libapache2-request-perl apache2-mpm-prefork].each do |pkg|
+    package pkg
+  end
+when 'rhel', 'fedora'
+  package 'mod_perl' do
+    notifies :run, 'execute[generate-module-list]', :immediately
+  end
+
+  package 'perl-libapreq2'
+end
+
+file "#{node['apache']['dir']}/conf.d/perl.conf" do
+  action :delete
+  backup false
+end
+
+apache_module 'perl'

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_php5.rb

@@ -0,0 +1,69 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: php5
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+case node['platform_family']
+when 'debian'
+  package 'libapache2-mod-php5'
+when 'arch'
+  package 'php-apache' do
+    notifies :run, 'execute[generate-module-list]', :immediately
+  end
+when 'rhel'
+  package 'which'
+
+  package 'php package' do
+    if node['platform_version'].to_f < 6.0
+      package_name 'php53'
+    else
+      package_name 'php'
+    end
+    notifies :run, 'execute[generate-module-list]', :immediately
+    not_if 'which php'
+  end
+when 'fedora'
+  package 'php package' do
+    package_name 'php'
+    notifies :run, 'execute[generate-module-list]', :immediately
+    not_if 'which php'
+  end
+when 'freebsd'
+  freebsd_port_options 'php5' do
+    options 'APACHE' => true
+    action :create
+  end
+
+  package 'php package' do
+    package_name 'php5'
+    source 'ports'
+    notifies :run, 'execute[generate-module-list]', :immediately
+  end
+end
+
+file "#{node['apache']['dir']}/conf.d/php.conf" do
+  action :delete
+  backup false
+end
+
+apache_module 'php5' do
+  case node['platform_family']
+  when 'rhel', 'fedora', 'freebsd'
+    conf true
+    filename 'libphp5.so'
+  end
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_proxy.rb

@@ -0,0 +1,22 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: proxy
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'proxy' do
+  conf true
+end

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_proxy_ajp.rb

@@ -0,0 +1,21 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: proxy
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+include_recipe 'apache2::mod_proxy'
+apache_module 'proxy_ajp'

xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/apache2/recipes/mod_proxy_balancer.rb

@@ -0,0 +1,20 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: proxy
+#
+# Copyright 2008-2013, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module 'proxy_balancer'