aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--files/htdocs/images/empty0
-rw-r--r--files/htdocs/index.html8
-rw-r--r--files/htdocs/missing.html12
-rw-r--r--manifests/subsystems/websites.pp9
4 files changed, 26 insertions, 3 deletions
diff --git a/files/htdocs/images/empty b/files/htdocs/images/empty
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/files/htdocs/images/empty
diff --git a/files/htdocs/index.html b/files/htdocs/index.html
new file mode 100644
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
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 9facbbf..1ca0ecb 100644
--- 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