aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-03-25 12:20:24 +0000
committerMichael Scherer <misc@mageia.org>2012-03-25 12:20:24 +0000
commitf83e2c85a7f0d2402982942150688b7373a9d5ab (patch)
tree34d781b4e3d3f8f1c763e80aec3e90703df75cbc /modules
parent777b01260256d148a821dbb27fb25ae881b84cc6 (diff)
downloadpuppet-f83e2c85a7f0d2402982942150688b7373a9d5ab.tar
puppet-f83e2c85a7f0d2402982942150688b7373a9d5ab.tar.gz
puppet-f83e2c85a7f0d2402982942150688b7373a9d5ab.tar.bz2
puppet-f83e2c85a7f0d2402982942150688b7373a9d5ab.tar.xz
puppet-f83e2c85a7f0d2402982942150688b7373a9d5ab.zip
split some others modules in separate file
Diffstat (limited to 'modules')
-rw-r--r--modules/apache/manifests/init.pp31
-rw-r--r--modules/apache/manifests/mod/deflate.pp4
-rw-r--r--modules/apache/manifests/mod/fastcgi.pp4
-rw-r--r--modules/apache/manifests/mod/fcgid.pp4
-rw-r--r--modules/apache/manifests/mod/geoip.pp4
-rw-r--r--modules/apache/manifests/mod/perl.pp4
-rw-r--r--modules/apache/manifests/mod/proxy.pp4
-rw-r--r--modules/apache/manifests/mod/public_html.pp4
-rw-r--r--modules/planet/manifests/init.pp2
-rw-r--r--modules/sympa/manifests/init.pp2
10 files changed, 32 insertions, 31 deletions
diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp
index de1544d0..c4645662 100644
--- a/modules/apache/manifests/init.pp
+++ b/modules/apache/manifests/init.pp
@@ -45,18 +45,6 @@ class apache {
}
}
- class mod_perl inherits base {
- package { "apache-mod_perl": }
- }
-
- class mod_fcgid inherits base {
- package { "apache-mod_fcgid": }
- }
-
- class mod_fastcgi inherits base {
- package { "apache-mod_fastcgi": }
- }
-
class mod_wsgi inherits base {
package { "apache-mod_wsgi": }
@@ -69,21 +57,6 @@ class apache {
}
}
- class mod_proxy inherits base {
- package { "apache-mod_proxy": }
- }
-
- class mod_public_html inherits base {
- package { "apache-mod_public_html": }
- }
-
- class mod_deflate inherits base {
- package { "apache-mod_deflate": }
- }
-
- class mod_geoip inherits base {
- package { "apache-mod_geoip": }
- }
define vhost_base($content = '',
$location = '/dev/null',
@@ -127,7 +100,7 @@ class apache {
}
if $enable_public_html {
- include apache::mod_public_html
+ include apache::mod::public_html
}
apache::config { "/etc/httpd/conf/vhosts.d/$filename":
@@ -207,7 +180,7 @@ class apache {
define vhost_reverse_proxy($url,
$vhost = false,
$use_ssl = false) {
- include apache::mod_proxy
+ include apache::mod::proxy
vhost_base { $name:
use_ssl => $use_ssl,
vhost => $vhost,
diff --git a/modules/apache/manifests/mod/deflate.pp b/modules/apache/manifests/mod/deflate.pp
new file mode 100644
index 00000000..0e2211aa
--- /dev/null
+++ b/modules/apache/manifests/mod/deflate.pp
@@ -0,0 +1,4 @@
+class apache::mod::deflate {
+ include apache::base
+ package { 'apache-mod_deflate': }
+}
diff --git a/modules/apache/manifests/mod/fastcgi.pp b/modules/apache/manifests/mod/fastcgi.pp
new file mode 100644
index 00000000..4f10ccab
--- /dev/null
+++ b/modules/apache/manifests/mod/fastcgi.pp
@@ -0,0 +1,4 @@
+class apache::mod::fastcgi {
+ include apache::base
+ package { 'apache-mod_fastcgi': }
+}
diff --git a/modules/apache/manifests/mod/fcgid.pp b/modules/apache/manifests/mod/fcgid.pp
new file mode 100644
index 00000000..6c815681
--- /dev/null
+++ b/modules/apache/manifests/mod/fcgid.pp
@@ -0,0 +1,4 @@
+class apache::mod::fcgid {
+ include apache::base
+ package { 'apache-mod_fcgid': }
+}
diff --git a/modules/apache/manifests/mod/geoip.pp b/modules/apache/manifests/mod/geoip.pp
new file mode 100644
index 00000000..7f5516bc
--- /dev/null
+++ b/modules/apache/manifests/mod/geoip.pp
@@ -0,0 +1,4 @@
+class apache::mod::geoip {
+ include apache::base
+ package { 'apache-mod_geoip': }
+}
diff --git a/modules/apache/manifests/mod/perl.pp b/modules/apache/manifests/mod/perl.pp
new file mode 100644
index 00000000..2c52bf50
--- /dev/null
+++ b/modules/apache/manifests/mod/perl.pp
@@ -0,0 +1,4 @@
+class apache::mod::perl {
+ include apache::base
+ package { 'apache-mod_perl': }
+}
diff --git a/modules/apache/manifests/mod/proxy.pp b/modules/apache/manifests/mod/proxy.pp
new file mode 100644
index 00000000..80180d62
--- /dev/null
+++ b/modules/apache/manifests/mod/proxy.pp
@@ -0,0 +1,4 @@
+class apache::mod::proxy {
+ include apache::base
+ package { 'apache-mod_proxy': }
+}
diff --git a/modules/apache/manifests/mod/public_html.pp b/modules/apache/manifests/mod/public_html.pp
new file mode 100644
index 00000000..b5691b53
--- /dev/null
+++ b/modules/apache/manifests/mod/public_html.pp
@@ -0,0 +1,4 @@
+class apache::mod::public_html {
+ include apache::base
+ package { 'apache-mod_public_html': }
+}
diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp
index e5b127b7..3951e10d 100644
--- a/modules/planet/manifests/init.pp
+++ b/modules/planet/manifests/init.pp
@@ -10,7 +10,7 @@ class planet {
$vhost = "planet.$domain"
include apache::mod_php
- include apache::mod_deflate
+ include apache::mod::deflate
apache::vhost_base { "$vhost":
location => $location,
diff --git a/modules/sympa/manifests/init.pp b/modules/sympa/manifests/init.pp
index 460e46bf..5a9affb8 100644
--- a/modules/sympa/manifests/init.pp
+++ b/modules/sympa/manifests/init.pp
@@ -45,7 +45,7 @@ class sympa {
}
- include apache::mod_fcgid
+ include apache::mod::fcgid
apache::webapp_other { 'sympa':
webapp_file => 'sympa/webapp_sympa.conf',
}