[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r182: Bring listen.conf under Puppet; add NameVirtualHost for SSL.
Jeff Licquia
licquia at linuxfoundation.org
Thu Feb 23 22:18:45 UTC 2012
------------------------------------------------------------
revno: 182
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Thu 2012-02-23 17:18:45 -0500
message:
Bring listen.conf under Puppet; add NameVirtualHost for SSL.
added:
modules/apachehttpd/files/listen.conf/
modules/apachehttpd/files/listen.conf/default-sles11
modules/apachehttpd/files/listen.conf/lsb1.linux-foundation.org
modified:
modules/apachehttpd/manifests/init.pp
-------------- next part --------------
=== added directory 'modules/apachehttpd/files/listen.conf'
=== added file 'modules/apachehttpd/files/listen.conf/default-sles11'
--- a/modules/apachehttpd/files/listen.conf/default-sles11 1970-01-01 00:00:00 +0000
+++ b/modules/apachehttpd/files/listen.conf/default-sles11 2012-02-23 22:18:45 +0000
@@ -0,0 +1,47 @@
+# Listen: Allows you to bind Apache to specific IP addresses and/or
+# ports. See also the <VirtualHost> directive.
+#
+# http://httpd.apache.org/docs-2.2/mod/mpm_common.html#listen
+#
+# Change this to Listen on specific IP addresses as shown below to
+# prevent Apache from glomming onto all bound IP addresses (0.0.0.0)
+#
+# When we also provide SSL we have to listen to the
+# standard HTTP port (see above) and to the HTTPS port
+#
+# Note: Configurations that use IPv6 but not IPv4-mapped addresses need two
+# Listen directives: "Listen [::]:443" and "Listen 0.0.0.0:443"
+#
+#Listen 12.34.56.78:80
+#Listen 80
+#Listen 443
+
+Listen 80
+
+
+<IfDefine SSL>
+ <IfDefine !NOSSL>
+ <IfModule mod_ssl.c>
+
+ Listen 443
+
+ </IfModule>
+ </IfDefine>
+</IfDefine>
+
+
+# Use name-based virtual hosting
+#
+# - on a specified address / port:
+#
+#NameVirtualHost 12.34.56.78:80
+#
+# - name-based virtual hosting:
+#
+NameVirtualHost *:80
+#
+# - on all addresses and ports. This is your best bet when you are on
+# dynamically assigned IP addresses:
+#
+#NameVirtualHost *
+
=== added file 'modules/apachehttpd/files/listen.conf/lsb1.linux-foundation.org'
--- a/modules/apachehttpd/files/listen.conf/lsb1.linux-foundation.org 1970-01-01 00:00:00 +0000
+++ b/modules/apachehttpd/files/listen.conf/lsb1.linux-foundation.org 2012-02-23 22:18:45 +0000
@@ -0,0 +1,49 @@
+# Listen: Allows you to bind Apache to specific IP addresses and/or
+# ports. See also the <VirtualHost> directive.
+#
+# http://httpd.apache.org/docs-2.2/mod/mpm_common.html#listen
+#
+# Change this to Listen on specific IP addresses as shown below to
+# prevent Apache from glomming onto all bound IP addresses (0.0.0.0)
+#
+# When we also provide SSL we have to listen to the
+# standard HTTP port (see above) and to the HTTPS port
+#
+# Note: Configurations that use IPv6 but not IPv4-mapped addresses need two
+# Listen directives: "Listen [::]:443" and "Listen 0.0.0.0:443"
+#
+#Listen 12.34.56.78:80
+#Listen 80
+#Listen 443
+
+Listen 80
+
+
+<IfDefine SSL>
+ <IfDefine !NOSSL>
+ <IfModule mod_ssl.c>
+
+ Listen 443
+
+ NameVirtualHost *:443
+
+ </IfModule>
+ </IfDefine>
+</IfDefine>
+
+
+# Use name-based virtual hosting
+#
+# - on a specified address / port:
+#
+#NameVirtualHost 12.34.56.78:80
+#
+# - name-based virtual hosting:
+#
+NameVirtualHost *:80
+#
+# - on all addresses and ports. This is your best bet when you are on
+# dynamically assigned IP addresses:
+#
+#NameVirtualHost *
+
=== modified file 'modules/apachehttpd/manifests/init.pp'
--- a/modules/apachehttpd/manifests/init.pp 2012-01-20 22:35:19 +0000
+++ b/modules/apachehttpd/manifests/init.pp 2012-02-23 22:18:45 +0000
@@ -13,6 +13,10 @@
source => [ "puppet:///modules/apachehttpd/httpd.conf/$fqdn", "puppet:///modules/apachehttpd/httpd.conf/$osdefault" ],
}
+ file { '/etc/apache2/listen.conf':
+ source => [ "puppet:///modules/apachehttpd/listen.conf/$fqdn", "puppet:///modules/apachehttpd/listen.conf/$osdefault" ],
+ }
+
file { '/etc/apache2/local.conf':
source => [ "puppet:///modules/apachehttpd/local.conf/$fqdn", "puppet:///modules/apachehttpd/local.conf/$osdefault" ],
}
More information about the lsb-messages
mailing list