[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r181: Fix refspecs so it works over SSL too.

Thu Feb 23 22:11:21 UTC 2012

------------------------------------------------------------
revno: 181
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Thu 2012-02-23 17:11:21 -0500
message:
  Fix refspecs so it works over SSL too.
modified:
  modules/apachehttpd/files/vhosts.d/lsb1.linux-foundation.org/refspecs.conf
-------------- next part --------------
=== modified file 'modules/apachehttpd/files/vhosts.d/lsb1.linux-foundation.org/refspecs.conf'

--- a/modules/apachehttpd/files/vhosts.d/lsb1.linux-foundation.org/refspecs.conf	2012-01-26 13:52:21 +0000
+++ b/modules/apachehttpd/files/vhosts.d/lsb1.linux-foundation.org/refspecs.conf	2012-02-23 22:11:21 +0000
@@ -1,17 +1,3 @@
-#
-# VirtualHost template
-# Note: to use the template, rename it to /etc/apache2/vhost.d/yourvhost.conf. 
-# Files must have the .conf suffix to be loaded.
-#
-# See /usr/share/doc/packages/apache2/README.QUICKSTART for further hints 
-# about virtual hosts.
-#
-# NameVirtualHost statements can be added to /etc/apache2/listen.conf.
-#
-# Almost any Apache directive may go into a VirtualHost container.
-# The first VirtualHost section is used for requests without a known
-# server name.
-#
 <VirtualHost *:80>
     ServerAdmin webmaster at linuxfoundation.org
     ServerName refspecs.linuxfoundation.org
@@ -19,117 +5,81 @@
     ServerAlias refspecs.linuxbase.org
     ServerAlias refspecs.linux-foundation.org
 
-    # DocumentRoot: The directory out of which you will serve your
-    # documents. By default, all requests are taken from this directory, but
-    # symbolic links and aliases may be used to point to other locations.
-    DocumentRoot /srv/www/vhosts/refspecs.linuxfoundation.org
-
-    # if not specified, the global error log is used
-    ErrorLog /var/log/apache2/refspecs.linuxfoundation.org-error_log
-    CustomLog /var/log/apache2/refspecs.linuxfoundation.org-access_log combined
-
-    # don't loose time with IP address lookups
-    HostnameLookups Off
-
-    # needed for named virtual hosts
-    UseCanonicalName Off
-
-    # configures the footer on server-generated documents
-    ServerSignature On
-
-
-    # Optionally, include *.conf files from /etc/apache2/conf.d/
-    #
-    # For example, to allow execution of PHP scripts:
-    #
-    # Include /etc/apache2/conf.d/mod_php4.conf
-    #
-    # or, to include all configuration snippets added by packages:
-    # Include /etc/apache2/conf.d/*.conf
-
-
-    # ScriptAlias: This controls which directories contain server scripts.
-    # ScriptAliases are essentially the same as Aliases, except that
-    # documents in the realname directory are treated as applications and
-    # run by the server when requested rather than as documents sent to the client.
-    # The same rules about trailing "/" apply to ScriptAlias directives as to
-    # Alias.
-    #
-    #ScriptAlias /cgi-bin/ "/srv/www/vhosts/refspecs.linuxfoundation.org/cgi-bin/"
-
-    # "/srv/www/cgi-bin" should be changed to whatever your ScriptAliased
-    # CGI directory exists, if you have one, and where ScriptAlias points to.
-    #
-    #<Directory "/srv/www/vhosts/refspecs.linuxfoundation.org/cgi-bin">
-	#AllowOverride None
-	#Options +ExecCGI -Includes
-	#Order allow,deny
-	#Allow from all
-    #</Directory>
-
-
-    # UserDir: The name of the directory that is appended onto a user's home
-    # directory if a ~user request is received.
-    #
-    # To disable it, simply remove userdir from the list of modules in APACHE_MODULES
-    # in /etc/sysconfig/apache2.
-    #
-    #<IfModule mod_userdir.c>
-	# Note that the name of the user directory ("public_html") cannot simply be
-	# changed here, since it is a compile time setting. The apache package
-	# would have to be rebuilt. You could work around by deleting
-	# /usr/sbin/suexec, but then all scripts from the directories would be
-	# executed with the UID of the webserver.
-	#UserDir public_html
-	# The actual configuration of the directory is in
-	# /etc/apache2/mod_userdir.conf.
-	#Include /etc/apache2/mod_userdir.conf
-	# You can, however, change the ~ if you find it awkward, by mapping e.g.
-	# http://www.example.com/users/karl-heinz/ --> /home/karl-heinz/public_html/
-	#AliasMatch ^/users/([a-zA-Z0-9-_.]*)/?(.*) /home/$1/public_html/$2
-    #</IfModule>
-
-
-    #
-    # This should be changed to whatever you set DocumentRoot to.
-    #
-    <Directory "/srv/www/vhosts/refspecs.linuxfoundation.org">
-    
-	#
-	# Possible values for the Options directive are "None", "All",
-	# or any combination of:
-	#   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
-	#
-	# Note that "MultiViews" must be named *explicitly* --- "Options All"
-	# doesn't give it to you.
-	#
-	# The Options directive is both complicated and important.  Please see
-	# http://httpd.apache.org/docs-2.2/mod/core.html#options
-	# for more information.
-	#
-	Options Includes Indexes FollowSymLinks MultiViews
-	DirectoryIndex index.shtml
-    
-	#
-	# AllowOverride controls what directives may be placed in .htaccess files.
-	# It can be "All", "None", or any combination of the keywords:
-	#   Options FileInfo AuthConfig Limit
-	#
-	AllowOverride None
-    
-	#
-	# Controls who can get stuff from this server.
-	#
-	Order allow,deny
-	Allow from all
-
-    </Directory>
-
-    # Make sure we process server-side includes.
-    <IfModule mod_include.c>
-        AddType text/html .shtml
-        AddOutputFilter INCLUDES .shtml
-    </IfModule>
-
-</VirtualHost>
-
+    DocumentRoot /srv/www/vhosts/refspecs.linuxfoundation.org
+
+    # if not specified, the global error log is used
+    ErrorLog /var/log/apache2/refspecs.linuxfoundation.org-error_log
+    CustomLog /var/log/apache2/refspecs.linuxfoundation.org-access_log combined
+
+    # don't loose time with IP address lookups
+    HostnameLookups Off
+
+    # needed for named virtual hosts
+    UseCanonicalName Off
+
+    # configures the footer on server-generated documents
+    ServerSignature On
+
+
+    <Directory "/srv/www/vhosts/refspecs.linuxfoundation.org">
+	Options Includes Indexes FollowSymLinks MultiViews
+	DirectoryIndex index.shtml
+	AllowOverride None
+	Order allow,deny
+	Allow from all
+    </Directory>
+
+    # Make sure we process server-side includes.
+    <IfModule mod_include.c>
+        AddType text/html .shtml
+        AddOutputFilter INCLUDES .shtml
+    </IfModule>
+
+</VirtualHost>
+
+<VirtualHost *:443>
+    ServerAdmin webmaster at linuxfoundation.org
+    ServerName refspecs.linuxbase.org
+    ServerAlias refspec.linuxbase.org
+
+    DocumentRoot /srv/www/vhosts/refspecs.linuxfoundation.org
+
+    # if not specified, the global error log is used
+    ErrorLog /var/log/apache2/refspecs.linuxfoundation.org-error_log
+    CustomLog /var/log/apache2/refspecs.linuxfoundation.org-access_log combined
+
+    # don't loose time with IP address lookups
+    HostnameLookups Off
+
+    # needed for named virtual hosts
+    UseCanonicalName Off
+
+    # configures the footer on server-generated documents
+    ServerSignature On
+
+
+    <Directory "/srv/www/vhosts/refspecs.linuxfoundation.org">
+	Options Includes Indexes FollowSymLinks MultiViews
+	DirectoryIndex index.shtml
+	AllowOverride None
+	Order allow,deny
+	Allow from all
+    </Directory>
+
+    # Make sure we process server-side includes.
+    <IfModule mod_include.c>
+        AddType text/html .shtml
+        AddOutputFilter INCLUDES .shtml
+    </IfModule>
+
+    # SSL stuff.
+	SSLEngine on
+	SSLProtocol all -SSLv2 -SSLv3
+	SSLCipherSuite ALL:!aNULL:!eNULL:!SSLv2:!LOW:!EXP:!MD5:@STRENGTH
+	SSLCertificateFile /etc/apache2/ssl.crt/linuxbase-sf_bundle.pem
+	SSLCertificateKeyFile /etc/apache2/ssl.key/linuxbase.key
+	SSLCertificateChainFile /etc/apache2/ssl.crt/linuxbase-sf_bundle.pem
+	<Files ~ "\.(cgi|shtml|phtml|php3?)$">
+	    SSLOptions +StdEnvVars
+	</Files>
+</VirtualHost>

