[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r593: Manage more of the linuxbase.org content in Puppet.
Jeff Licquia
licquia at linuxfoundation.org
Thu Jun 26 19:04:10 UTC 2014
------------------------------------------------------------
revno: 593
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Thu 2014-06-26 15:04:10 -0400
message:
Manage more of the linuxbase.org content in Puppet.
added:
modules/apachehttpd/files/content/default/
modules/apachehttpd/files/content/default/freenode.txt
modules/apachehttpd/files/content/default/maintenance.html
modules/apachehttpd/files/content/default/robots.txt
modules/apachehttpd/manifests/linuxbase.pp
modified:
manifests/nodes/lsb1.pp
manifests/nodes/lsb2.pp
-------------- next part --------------
=== modified file 'manifests/nodes/lsb1.pp'
--- a/manifests/nodes/lsb1.pp 2014-05-01 19:44:38 +0000
+++ b/manifests/nodes/lsb1.pp 2014-06-26 19:04:10 +0000
@@ -9,7 +9,7 @@
include puppet
include apachehttpd, apachehttpd::vhosts, apachehttpd::betaspecs,
- apachehttpd::modules, apachehttpd::ssl
+ apachehttpd::modules, apachehttpd::ssl, apachehttpd::linuxbase
include php
=== modified file 'manifests/nodes/lsb2.pp'
--- a/manifests/nodes/lsb2.pp 2014-06-10 14:46:06 +0000
+++ b/manifests/nodes/lsb2.pp 2014-06-26 19:04:10 +0000
@@ -11,7 +11,7 @@
include mail::linuxbase
include apachehttpd, apachehttpd::vhosts, apachehttpd::betaspecs,
- apachehttpd::modules, apachehttpd::ssl
+ apachehttpd::modules, apachehttpd::ssl, apachehttpd::linuxbase
include php
=== added directory 'modules/apachehttpd/files/content/default'
=== added file 'modules/apachehttpd/files/content/default/freenode.txt'
--- a/modules/apachehttpd/files/content/default/freenode.txt 1970-01-01 00:00:00 +0000
+++ b/modules/apachehttpd/files/content/default/freenode.txt 2014-06-26 19:04:10 +0000
@@ -0,0 +1,1 @@
+hello world jbroome
=== added file 'modules/apachehttpd/files/content/default/maintenance.html'
--- a/modules/apachehttpd/files/content/default/maintenance.html 1970-01-01 00:00:00 +0000
+++ b/modules/apachehttpd/files/content/default/maintenance.html 2014-06-26 19:04:10 +0000
@@ -0,0 +1,10 @@
+<html>
+<head>
+<title>Maintenance Page</title>
+</head>
+<body>
+<p>We're sorry, but the LSB Navigator is currently down for maintenance.
+Please check back later.</p>
+</body>
+</html>
+
=== added file 'modules/apachehttpd/files/content/default/robots.txt'
--- a/modules/apachehttpd/files/content/default/robots.txt 1970-01-01 00:00:00 +0000
+++ b/modules/apachehttpd/files/content/default/robots.txt 2014-06-26 19:04:10 +0000
@@ -0,0 +1,3 @@
+User-agent: *
+Disallow: /navigator/
+Disallow: /dbadmin/
=== added file 'modules/apachehttpd/manifests/linuxbase.pp'
--- a/modules/apachehttpd/manifests/linuxbase.pp 1970-01-01 00:00:00 +0000
+++ b/modules/apachehttpd/manifests/linuxbase.pp 2014-06-26 19:04:10 +0000
@@ -0,0 +1,29 @@
+class apachehttpd::linuxbase {
+
+ include apachehttpd
+
+ include apachehttpd::vhosts
+
+ include apachehttpd::betaspecs
+
+ file { '/srv/www/vhosts/linuxbase.org':
+ ensure => directory,
+ require => File['/srv/www/vhosts'],
+ }
+
+ file { '/srv/www/vhosts/linuxbase.org/freenode.txt':
+ source => "puppet:///modules/apachehttpd/content/default/freenode.txt",
+ require => File['/srv/www/vhosts/linuxbase.org'],
+ }
+
+ file { '/srv/www/vhosts/linuxbase.org/robots.txt':
+ source => "puppet:///modules/apachehttpd/content/default/robots.txt",
+ require => File['/srv/www/vhosts/linuxbase.org'],
+ }
+
+ file { '/srv/www/vhosts/linuxbase.org/maintenance.html':
+ source => "puppet:///modules/apachehttpd/content/default/maintenance.html",
+ require => File['/srv/www/vhosts/linuxbase.org'],
+ }
+
+}
More information about the lsb-messages
mailing list