More changes for puppet 3.x

6 files changed, 65 insertions, 0 deletions

diff --git a/modules/site_users/manifests/admin.pp b/modules/site_users/manifests/admin.pp
new file mode 100644
index 0000000..14ad9da
--- /dev/null
+++ b/modules/site_users/manifests/admin.pp
@@ -0,0 +1,16 @@
+class site_users::admin inherits user {
+  # root user and password
+  #user::manage { "root":
+  #  tag      => "admin",
+  #  homedir  => '/root',
+  #  password => '$5$zpdXgIaLKMDckKx9$qTS9WbmS/zylFwPu1orq.779CNnAiA9VoGdFNU94jz/',
+  #}
+
+  # first user config
+  #user::manage { "user":
+  #  tag      => "admin",
+  #  groups   => [ "sudo", ],
+  #  password => '$5$D8kCEIo5/MNCA7Tz$VhGg2MNDs21JzX9HgxSWMupA5GD5MXnKwDuveMSdPH7',
+  #  sshkey   => [ "WRONG" ],
+  #}
+}
diff --git a/modules/site_users/manifests/backups.pp b/modules/site_users/manifests/backups.pp
new file mode 100644
index 0000000..aab00f9
--- /dev/null
+++ b/modules/site_users/manifests/backups.pp
@@ -0,0 +1,3 @@
+class site_users::backup inherits user {
+  # define third-party hosted backup users here
+}
diff --git a/modules/site_users/manifests/init.pp b/modules/site_users/manifests/init.pp
new file mode 100644
index 0000000..b3c656a
--- /dev/null
+++ b/modules/site_users/manifests/init.pp
@@ -0,0 +1,2 @@
+class site_users {
+}
diff --git a/modules/site_users/manifests/virtual.pp b/modules/site_users/manifests/virtual.pp
new file mode 100644
index 0000000..20aba01
--- /dev/null
+++ b/modules/site_users/manifests/virtual.pp
@@ -0,0 +1,3 @@
+class site_users::virtual inherits user {
+  # define custom users here
+}
diff --git a/modules/site_websites/manifests/admin.pp b/modules/site_websites/manifests/admin.pp
new file mode 100644
index 0000000..0be3a94
--- /dev/null
+++ b/modules/site_websites/manifests/admin.pp
@@ -0,0 +1,25 @@
+class site_websites::admin inherits websites::hosting::admin {
+  # An administrative Trac instance
+  #apache::site { "admin":
+  #  docroot        => "${apache::sites_folder}/admin/trac/htdocs",
+  #  use            => [ "Trac admin" ],
+  #  redirect_match => "trac",
+  #  mpm            => false,
+  #  tag            => 'all',
+  #}
+
+  apache::site { "munin":
+    docroot        => '/var/www/munin',
+    owner          => "munin",
+    group          => "munin",
+    mpm            => false,
+    tag            => 'all',
+  }
+
+  apache::site { "nagios":
+    source         => true,
+    docroot        => '/usr/share/nagios3/htdocs',
+    mpm            => false,
+    tag            => 'all',
+  }
+}
diff --git a/modules/site_websites/manifests/init.pp b/modules/site_websites/manifests/init.pp
new file mode 100644
index 0000000..f9d900a
--- /dev/null
+++ b/modules/site_websites/manifests/init.pp
@@ -0,0 +1,16 @@
+class site_websites inherits websites::hosting {
+  # Website definitions: always use tagged resources
+
+  #apache::site { "site":
+  #  source         => true,
+  #  ticket         => '001',
+  #  docroot        => '/var/www/site',
+  #  tag            => 'all',
+  #}
+
+  #database::instance { "site":
+  #  password => 'xxx',
+  #  tag      => 'all',
+  #}
+
+}