]> gitweb.fluxo.info Git - puppet-nodo.git/commitdiff
projects / puppet-nodo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d0be028)
Switching to site-module convention and adding fallback sources
authorSilvio Rhatto <rhatto@riseup.net>
Thu, 14 Jul 2011 17:25:20 +0000 (14:25 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Thu, 14 Jul 2011 17:25:20 +0000 (14:25 -0300)
files/htdocs/images/empty [new file with mode: 0644] patch | blob
files/htdocs/index.html [new file with mode: 0644] patch | blob
files/htdocs/missing.html [new file with mode: 0644] patch | blob
manifests/subsystems/websites.pp patch | blob | history

diff --git a/files/htdocs/images/empty b/files/htdocs/images/empty
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/files/htdocs/index.html b/files/htdocs/index.html
new file mode 100644 (file)
index 0000000..a355b8f
--- /dev/null
+++ b/files/htdocs/index.html
@@ -0,0 +1,8 @@
+<html><head>
+<title>Nodo Network</title></head><body>
+
+<center>
+  <p><code>Welcome to our network!</code></p>
+</center>
+
+</body></html>
diff --git a/files/htdocs/missing.html b/files/htdocs/missing.html
new file mode 100644 (file)
index 0000000..0fbf1af
--- /dev/null
+++ b/files/htdocs/missing.html
@@ -0,0 +1,12 @@
+<html>
+<head>
+<title>404 - Not Found</title>
+</head>
+<body>
+  <center>
+  <pre>
+  File not found :(
+  </pre>
+  </center>
+</body>
+</html>
diff --git a/manifests/subsystems/websites.pp b/manifests/subsystems/websites.pp
index 9facbbfaf10daf939f421de247c3462485e9ffe0..1ca0ecb22a2a5517a909605787df228b6f7c86dd 100644 (file)
--- a/manifests/subsystems/websites.pp
+++ b/manifests/subsystems/websites.pp
@@ -36,7 +36,8 @@ class websites::setup {
     # This mode will also apply to files from the source directory
     mode    => 0644,
     # Puppet will automatically set +x for directories
-    source  => "puppet://$server/files/apache/htdocs/images",
+    source  => [ "puppet:///modules/site-apache/htdocs/images",
+                 "puppet:///modules/nodo/htdocs/images", ]
   }
 
   # Web index
@@ -45,7 +46,8 @@ class websites::setup {
     owner   => "root",
     group   => "root",
     mode    => 0644,
-    source  => "puppet://$server/files/apache/htdocs/index.html",
+    source  => [ "puppet:///modules/site-apache/htdocs/index.html",
+                 "puppet:///modules/nodo/htdocs/index.html", ]
   }
 
   # Missing page
@@ -54,7 +56,8 @@ class websites::setup {
     owner   => "root",
     group   => "root",
     mode    => 0644,
-    source  => "puppet://$server/files/apache/htdocs/missing.html",
+    source  => [ "puppet:///modules/site-apache/htdocs/missing.html",
+                 "puppet:///modules/nodo/htdocs/missing.html", ]
   }
 
   # Default vhost: can just be applied on the defining host
Puppet module for nodo management