Move apache module configs to apache2::module dir; add compat includes

diff --git a/modules/apache2/manifests/auth_digest.pp b/modules/apache2/manifests/auth_digest.pp
index d5c19df..565f450 100644 (file)
--- a/modules/apache2/manifests/auth_digest.pp
+++ b/modules/apache2/manifests/auth_digest.pp
@@ -1,3 +1,3 @@
 class apache2::auth_digest {
-  apache2::module { 'auth_digest': }
+  include apache2::module::auth_digest
 }

diff --git a/modules/apache2/manifests/authn_anon.pp b/modules/apache2/manifests/authn_anon.pp
index 2ae573d..28ff338 100644 (file)
--- a/modules/apache2/manifests/authn_anon.pp
+++ b/modules/apache2/manifests/authn_anon.pp
@@ -1,3 +1,3 @@
 class apache2::authn_anon {
-  apache2::module { 'authn_anon': }
+  include apache2::module::authn_anon
 }

diff --git a/modules/apache2/manifests/authn_file.pp b/modules/apache2/manifests/authn_file.pp
index 09b59f7..f9c5ae7 100644 (file)
--- a/modules/apache2/manifests/authn_file.pp
+++ b/modules/apache2/manifests/authn_file.pp
@@ -1,3 +1,3 @@
 class apache2::authn_file {
-  apache2::module { 'authn_file': }
+  include apache2::module::authn_file
 }

diff --git a/modules/apache2/manifests/expires.pp b/modules/apache2/manifests/expires.pp
index 0364509..1dc8a86 100644 (file)
--- a/modules/apache2/manifests/expires.pp
+++ b/modules/apache2/manifests/expires.pp
@@ -1,3 +1,3 @@
 class apache2::expires {
-  apache2::module { 'expires': }
+  include apache2::module::expires
 }

diff --git a/modules/apache2/manifests/module/auth_digest.pp b/modules/apache2/manifests/module/auth_digest.pp
new file mode 100644 (file)
index 0000000..6430aec
--- /dev/null
+++ b/modules/apache2/manifests/module/auth_digest.pp
@@ -0,0 +1,3 @@
+class apache2::module::auth_digest {
+  apache2::module { 'auth_digest': }
+}

diff --git a/modules/apache2/manifests/module/authn_anon.pp b/modules/apache2/manifests/module/authn_anon.pp
new file mode 100644 (file)
index 0000000..760c359
--- /dev/null
+++ b/modules/apache2/manifests/module/authn_anon.pp
@@ -0,0 +1,3 @@
+class apache2::module::authn_anon {
+  apache2::module { 'authn_anon': }
+}

diff --git a/modules/apache2/manifests/module/authn_file.pp b/modules/apache2/manifests/module/authn_file.pp
new file mode 100644 (file)
index 0000000..82033a1
--- /dev/null
+++ b/modules/apache2/manifests/module/authn_file.pp
@@ -0,0 +1,3 @@
+class apache2::module::authn_file {
+  apache2::module { 'authn_file': }
+}

diff --git a/modules/apache2/manifests/module/expires.pp b/modules/apache2/manifests/module/expires.pp
new file mode 100644 (file)
index 0000000..905deb7
--- /dev/null
+++ b/modules/apache2/manifests/module/expires.pp
@@ -0,0 +1,3 @@
+class apache2::module::expires {
+  apache2::module { 'expires': }
+}

diff --git a/modules/apache2/manifests/module/proxy_http.pp b/modules/apache2/manifests/module/proxy_http.pp
new file mode 100644 (file)
index 0000000..59d6f6e
--- /dev/null
+++ b/modules/apache2/manifests/module/proxy_http.pp
@@ -0,0 +1,3 @@
+class apache2::module::proxy_http {
+  apache2::module { 'proxy_http': }
+}

diff --git a/modules/apache2/manifests/module/rewrite.pp b/modules/apache2/manifests/module/rewrite.pp
new file mode 100644 (file)
index 0000000..cac209b
--- /dev/null
+++ b/modules/apache2/manifests/module/rewrite.pp
@@ -0,0 +1,3 @@
+class apache2::module::rewrite {
+  apache2::module { 'rewrite': }
+}

diff --git a/modules/apache2/manifests/module/ssl.pp b/modules/apache2/manifests/module/ssl.pp
new file mode 100644 (file)
index 0000000..8828cba
--- /dev/null
+++ b/modules/apache2/manifests/module/ssl.pp
@@ -0,0 +1,3 @@
+class apache2::module::ssl {
+  apache2::module { 'ssl': }
+}

diff --git a/modules/apache2/manifests/proxy_http.pp b/modules/apache2/manifests/proxy_http.pp
index 4b2a909..df15ab4 100644 (file)
--- a/modules/apache2/manifests/proxy_http.pp
+++ b/modules/apache2/manifests/proxy_http.pp
@@ -1,3 +1,3 @@
 class apache2::proxy_http {
-  apache2::module { 'proxy_http': }
+  include apache2::module::proxy_http
 }

diff --git a/modules/apache2/manifests/rewrite.pp b/modules/apache2/manifests/rewrite.pp
index bcd75f1..a097ccf 100644 (file)
--- a/modules/apache2/manifests/rewrite.pp
+++ b/modules/apache2/manifests/rewrite.pp
@@ -1,3 +1,3 @@
 class apache2::rewrite {
-  apache2::module { 'rewrite': }
+  include apache2::module::rewrite
 }

diff --git a/modules/apache2/manifests/ssl.pp b/modules/apache2/manifests/ssl.pp
index 6611381..21a5c17 100644 (file)
--- a/modules/apache2/manifests/ssl.pp
+++ b/modules/apache2/manifests/ssl.pp
@@ -1,3 +1,3 @@
 class apache2::ssl {
-  apache2::module { 'ssl': }
+  include apache2::module::ssl
 }