Switching to site-module convention

diff --git a/manifests/classes/default_conf.pp b/manifests/classes/default_conf.pp
index 7104bb9d66c199c729666aa79b570054ff940d3c..65060b05cf037caf8d9b04e82057d66757798848 100644 (file)
--- a/manifests/classes/default_conf.pp
+++ b/manifests/classes/default_conf.pp
@@ -24,8 +24,6 @@ class default_conf {
     require => File["$default_puppet_conf_dir"],
   }
 
-
-
   # files in $default_puppet_conf_dir
   file { "$default_puppet_conf_dir/puppet.conf":
     ensure  => present,
@@ -156,129 +154,143 @@ class default_conf {
     content => template("$templates_dir/puppet/test.pp.erb"),
   }
 
-
   # files in $default_puppet_conf_dir/files
-  file { [ "$default_puppet_conf_dir/files/etc",
-           "$default_puppet_conf_dir/files/etc/nginx",
-           "$default_puppet_conf_dir/files/etc/nagios3",
-           "$default_puppet_conf_dir/files/postfix",
-           "$default_puppet_conf_dir/files/apache",
-           "$default_puppet_conf_dir/files/apache/vhosts",
-           "$default_puppet_conf_dir/files/apache/htdocs",
-           "$default_puppet_conf_dir/files/apache/htdocs/images",
-           "$default_puppet_conf_dir/files/keys",
-           "$default_puppet_conf_dir/files/keys/ssl", ]:
+  file { [ "$default_puppet_conf_dir/files",
+           "$default_puppet_conf_dir/modules/site-nginx",
+           "$default_puppet_conf_dir/modules/site-nginx/files",
+           "$default_puppet_conf_dir/modules/site-nagios",
+           "$default_puppet_conf_dir/modules/site-nagios/files",
+           "$default_puppet_conf_dir/modules/site-postfix",
+           "$default_puppet_conf_dir/modules/site-postfix/files",
+           "$default_puppet_conf_dir/modules/site-mail",
+           "$default_puppet_conf_dir/modules/site-mail/files",
+           "$default_puppet_conf_dir/modules/site-apache",
+           "$default_puppet_conf_dir/modules/site-apache/files",
+           "$default_puppet_conf_dir/modules/site-apache/files/vhosts",
+           "$default_puppet_conf_dir/modules/site-apache/files/htdocs",
+           "$default_puppet_conf_dir/modules/site-apache/files/htdocs/images",
+           "$default_puppet_conf_dir/modules/site-keys",
+           "$default_puppet_conf_dir/modules/site-keys/files",
+           "$default_puppet_conf_dir/modules/site-keys/files/ssl", ]:
     ensure  => directory,
     owner   => "puppet",
     group   => "puppet",
     mode    => 0755,
   }
 
-  file { "$default_puppet_conf_dir/files/apache/htdocs/images/README.html":
+  file { "$default_puppet_conf_dir/files/empty":
+    ensure  => present,
+    owner   => "puppet",
+    group   => "puppet",
+    mode    => 0644,
+    require => [ Package["puppet"], File["$default_puppet_conf_dir/files"] ],
+  }
+
+  file { "$default_puppet_conf_dir/modules/site-apache/htdocs/images/README.html":
     ensure  => present,
     owner   => "puppet",
     group   => "puppet",
     mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/files/apache/htdocs/images"] ],
+    require => [ Package["puppet"], File["$default_puppet_conf_dir/modules/site-apache/files/htdocs/images"] ],
     content => template("$templates_dir/apache/htdocs/images/README.html.erb"),
   }
 
-  file { "$default_puppet_conf_dir/files/apache/htdocs/index.html":
+  file { "$default_puppet_conf_dir/modules/site-apache/files/htdocs/index.html":
     ensure  => present,
     owner   => "puppet",
     group   => "puppet",
     mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/files/apache/htdocs"] ],
+    require => [ Package["puppet"], File["$default_puppet_conf_dir/modules/site-apache/files/htdocs"] ],
     content => template("$templates_dir/apache/htdocs/index.html.erb"),
   }
 
-  file { "$default_puppet_conf_dir/files/apache/htdocs/missing.html":
+  file { "$default_puppet_conf_dir/modules/site-apache/files/htdocs/missing.html":
     ensure  => present,
     owner   => "puppet",
     group   => "puppet",
     mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/files/apache/htdocs"] ],
+    require => [ Package["puppet"], File["$default_puppet_conf_dir/modules/site-apache/files/htdocs"] ],
     content => template("$templates_dir/apache/htdocs/missing.html.erb"),
   }
 
-  file { "$default_puppet_conf_dir/files/apache/vhosts/git":
+  file { "$default_puppet_conf_dir/modules/site-apache/files/vhosts/git":
     ensure  => present,
     owner   => "puppet",
     group   => "puppet",
     mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/files/apache/vhosts"] ],
+    require => [ Package["puppet"], File["$default_puppet_conf_dir/modules/site-apache/files/vhosts"] ],
     content => template("$templates_dir/apache/vhosts/git.erb"),
   }
 
-  file { "$default_puppet_conf_dir/files/apache/vhosts/lists":
+  file { "$default_puppet_conf_dir/modules/site-apache/files/vhosts/lists":
     ensure  => present,
     owner   => "puppet",
     group   => "puppet",
     mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/files/apache/vhosts"] ],
+    require => [ Package["puppet"], File["$default_puppet_conf_dir/modules/site-apache/files/vhosts"] ],
     content => template("$templates_dir/apache/vhosts/lists.erb"),
   }
 
-  file { "$default_puppet_conf_dir/files/apache/vhosts/mail":
+  file { "$default_puppet_conf_dir/modules/site-apache/files/vhosts/mail":
     ensure  => present,
     owner   => "puppet",
     group   => "puppet",
     mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/files/apache/vhosts"] ],
+    require => [ Package["puppet"], File["$default_puppet_conf_dir/modules/site-apache/files/vhosts"] ],
     content => template("$templates_dir/apache/vhosts/mail.erb"),
   }
 
-  file { "$default_puppet_conf_dir/files/apache/vhosts/nagios":
+  file { "$default_puppet_conf_dir/modules/site-apache/files/vhosts/nagios":
     ensure  => present,
     owner   => "puppet",
     group   => "puppet",
     mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/files/apache/vhosts"] ],
+    require => [ Package["puppet"], File["$default_puppet_conf_dir/modules/site-apache/files/vhosts"] ],
     content => template("$templates_dir/apache/vhosts/nagios.erb"),
   }
 
-  file { "$default_puppet_conf_dir/files/apache/vhosts/wiki":
+  file { "$default_puppet_conf_dir/modules/site-apache/files/vhosts/wiki":
     ensure  => present,
     owner   => "puppet",
     group   => "puppet",
     mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/files/apache/vhosts"] ],
+    require => [ Package["puppet"], File["$default_puppet_conf_dir/modules/site-apache/files/vhosts"] ],
     content => template("$templates_dir/apache/vhosts/wiki.erb"),
   }
 
-  file { "$default_puppet_conf_dir/files/etc/aliases":
+  file { "$default_puppet_conf_dir/modules/site-mail/files/aliases":
     ensure  => present,
     owner   => "puppet",
     group   => "puppet",
     mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/files/etc"] ],
+    require => [ Package["puppet"], File["$default_puppet_conf_dir/modules/site-mail/files"] ],
     content => template("$templates_dir/etc/aliases.erb"),
   }
 
-  file { "$default_puppet_conf_dir/files/etc/nagios3/htpasswd.users":
+  file { "$default_puppet_conf_dir/modules/site-nagios/files/htpasswd.users":
     ensure  => present,
     owner   => "puppet",
     group   => "puppet",
     mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/files/etc/nagios3"] ],
+    require => [ Package["puppet"], File["$default_puppet_conf_dir/modules/site-nagios/files"] ],
     content => template("$templates_dir/etc/nagios3/htpasswd.users.erb"),
   }
 
-  file { "$default_puppet_conf_dir/files/etc/nginx/$domain":
+  file { "$default_puppet_conf_dir/modules/site-nginx/files/$domain":
     ensure  => present,
     owner   => "puppet",
     group   => "puppet",
     mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/files/etc/nginx"] ],
+    require => [ Package["puppet"], File["$default_puppet_conf_dir/modules/site-nginx/files"] ],
     content => template("$templates_dir/etc/nginx/domain.erb"),
   }
 
-  file { "$default_puppet_conf_dir/files/postfix/tls_policy":
+  file { "$default_puppet_conf_dir/modules/site-postfix/files/tls_policy":
     ensure  => present,
     owner   => "puppet",
     group   => "puppet",
     mode    => 0644,
-    require => [ Package["puppet"], File["$default_puppet_conf_dir/files/postfix"] ],
+    require => [ Package["puppet"], File["$default_puppet_conf_dir/modules/site-postfix/files"] ],
     content => template("$templates_dir/postfix/tls_policy.erb"),
   }
 }