More changes for puppet 3.x

diff --git a/manifests/bootstrap/configurator.pp b/manifests/bootstrap/configurator.pp
index d93a0ceef9af0100323a9533d9a4994e0fcbd180..edcbe92ab8109d4a326f398913a9928701cf0376 100644 (file)
--- a/manifests/bootstrap/configurator.pp
+++ b/manifests/bootstrap/configurator.pp
@@ -74,7 +74,7 @@ file { "$bootstrap_path/auth.conf":
 #
 # Basic users
 #
-file { "$bootstrap_path/manifests/classes/users.pp":
+file { "$bootstrap_path/modules/site_users/manifests/init.pp":
   ensure  => present,
   mode    => 0644,
   content => template("$templates/puppet/users.pp.erb"),

diff --git a/manifests/bootstrap/host.pp b/manifests/bootstrap/host.pp
index c1aead875b83a20612ee8b7bfc8b8f66b50cf285..c403eeab09532016efece9b10e9cc00a32ed8ec7 100644 (file)
--- a/manifests/bootstrap/host.pp
+++ b/manifests/bootstrap/host.pp
@@ -4,9 +4,6 @@
 # virtual machine.
 #
 
-# Import site configuration
-import "../site.pp"
-
 # The server role
 include nodo::role::server
 

diff --git a/manifests/bootstrap/master.pp b/manifests/bootstrap/master.pp
index 51167f30981fe01f671882fba02ee870013c4bee..73c075cd496c13c53e0578ce0f12032cea841f69 100644 (file)
--- a/manifests/bootstrap/master.pp
+++ b/manifests/bootstrap/master.pp
@@ -5,8 +5,5 @@
 # Once it's running it can setup all the other nodes.
 #
 
-# Import site configuration
-import "../site.pp"
-
 # Include the master node configuration
 include nodo::role::master

diff --git a/modules/site_users/manifests/admin.pp b/modules/site_users/manifests/admin.pp
new file mode 100644 (file)
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 (file)
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 (file)
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 (file)
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/manifests/classes/websites.pp b/modules/site_websites/manifests/admin.pp
similarity index 60%
rename from manifests/classes/websites.pp
rename to modules/site_websites/manifests/admin.pp
index a53d507c6f0447cfe15dac2fca1a6e541aa7329d..0be3a94c841f140538a1c03f2951312682fe279b 100644 (file)
--- a/manifests/classes/websites.pp
+++ b/modules/site_websites/manifests/admin.pp
@@ -1,4 +1,4 @@
-class websites::admin inherits websites::hosting::admin {
+class site_websites::admin inherits websites::hosting::admin {
   # An administrative Trac instance
   #apache::site { "admin":
   #  docroot        => "${apache::sites_folder}/admin/trac/htdocs",
@@ -23,20 +23,3 @@ class websites::admin inherits websites::hosting::admin {
     tag            => 'all',
   }
 }
-
-class 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',
-  #}
-
-}

diff --git a/modules/site_websites/manifests/init.pp b/modules/site_websites/manifests/init.pp
new file mode 100644 (file)
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',
+  #}
+
+}

diff --git a/templates/puppet/users.pp.erb b/templates/puppet/users.pp.erb
index 55a27066c226f1fcb8a8a6f69902b5a1db3d99b6..3b7c857be61794c4ea7eb98288667ae5bad45d8a 100644 (file)
--- a/templates/puppet/users.pp.erb
+++ b/templates/puppet/users.pp.erb
@@ -7,14 +7,6 @@ class users::backup inherits user {
 }
 
 class users::admin inherits user {
-
-  # Reprepro group needed for web nodes
-  #if !defined(Group["reprepro"]) {
-  #  group { "reprepro":
-  #    ensure => present,
-  #  }
-  #}
-
   # root user and password
   user::manage { "root":
     tag      => "admin",