Merge commit '5512c493e13998d4c83d7eab3d89e5a1c0836566' into develop

Conflicts:
	puppet/puppet.conf

4 files changed, 24 insertions, 0 deletions

diff --git a/puppet/modules/site_users/manifests/admin.pp b/puppet/modules/site_users/manifests/admin.pp
new file mode 100644
index 0000000..14ad9da
--- /dev/null
+++ b/puppet/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/puppet/modules/site_users/manifests/backups.pp b/puppet/modules/site_users/manifests/backups.pp
new file mode 100644
index 0000000..aab00f9
--- /dev/null
+++ b/puppet/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/puppet/modules/site_users/manifests/init.pp b/puppet/modules/site_users/manifests/init.pp
new file mode 100644
index 0000000..b3c656a
--- /dev/null
+++ b/puppet/modules/site_users/manifests/init.pp
@@ -0,0 +1,2 @@
+class site_users {
+}
diff --git a/puppet/modules/site_users/manifests/virtual.pp b/puppet/modules/site_users/manifests/virtual.pp
new file mode 100644
index 0000000..20aba01
--- /dev/null
+++ b/puppet/modules/site_users/manifests/virtual.pp
@@ -0,0 +1,3 @@
+class site_users::virtual inherits user {
+  # define custom users here
+}