diff options
| author | Michael Scherer <misc@mageia.org> | 2012-04-02 11:05:37 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2012-04-02 11:05:37 +0000 |
| commit | cc26741edadc4fa7da2b5854c674b29a324e6100 (patch) | |
| tree | 4f13ee25cc5d8de08019db98088a99da33165519 | |
| parent | f6c93e0bda5c042d0ee3d25348df04d069997fb3 (diff) | |
| download | puppet-cc26741edadc4fa7da2b5854c674b29a324e6100.tar puppet-cc26741edadc4fa7da2b5854c674b29a324e6100.tar.gz puppet-cc26741edadc4fa7da2b5854c674b29a324e6100.tar.bz2 puppet-cc26741edadc4fa7da2b5854c674b29a324e6100.tar.xz puppet-cc26741edadc4fa7da2b5854c674b29a324e6100.zip | |
split vhost_catalyst_app in a separate file
| -rw-r--r-- | modules/apache/manifests/init.pp | 10 | ||||
| -rw-r--r-- | modules/apache/manifests/vhost/catalyst_app.pp | 14 | ||||
| -rw-r--r-- | modules/catdap/manifests/snapshot.pp | 2 | ||||
| -rw-r--r-- | modules/epoll/manifests/init.pp | 2 | ||||
| -rw-r--r-- | modules/mga-mirrors/manifests/init.pp | 2 |
5 files changed, 17 insertions, 13 deletions
diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp index bac1858d..5bfaa004 100644 --- a/modules/apache/manifests/init.pp +++ b/modules/apache/manifests/init.pp @@ -1,14 +1,4 @@ class apache { - define vhost_catalyst_app($script, $location = '', $process = 4, $use_ssl = false, $vhost = false) { - - include apache::mod::fastcgi - apache::vhost::base { $name: - vhost => $vhost, - use_ssl => $use_ssl, - content => template("apache/vhost_catalyst_app.conf"), - } - } - define vhost_simple($location) { include apache::base apache::vhost::base { $name: diff --git a/modules/apache/manifests/vhost/catalyst_app.pp b/modules/apache/manifests/vhost/catalyst_app.pp new file mode 100644 index 00000000..54a00fb2 --- /dev/null +++ b/modules/apache/manifests/vhost/catalyst_app.pp @@ -0,0 +1,14 @@ +define apache::vhost::catalyst_app( $script, + $location = '', + $process = 4, + $use_ssl = false, + $vhost = false) { + include apache::mod::fastcgi + apache::vhost::base { $name: + vhost => $vhost, + use_ssl => $use_ssl, + content => template('apache/vhost_catalyst_app.conf'), + } +} + + diff --git a/modules/catdap/manifests/snapshot.pp b/modules/catdap/manifests/snapshot.pp index 10695f03..95adefe2 100644 --- a/modules/catdap/manifests/snapshot.pp +++ b/modules/catdap/manifests/snapshot.pp @@ -10,7 +10,7 @@ define catdap::snapshot($location, $svn_location) { source => $svn_location } - apache::vhost_catalyst_app { $name: + apache::vhost::catalyst_app { $name: script => "$location/script/catdap_fastcgi.pl", location => $location, use_ssl => true, diff --git a/modules/epoll/manifests/init.pp b/modules/epoll/manifests/init.pp index 7d8420c0..f00d2a3e 100644 --- a/modules/epoll/manifests/init.pp +++ b/modules/epoll/manifests/init.pp @@ -4,7 +4,7 @@ class epoll { package { 'Epoll': } - apache::vhost_catalyst_app { $vhost: + apache::vhost::catalyst_app { $vhost: script => '/usr/bin/epoll_fastcgi.pl', use_ssl => true, require => Package['Epoll'] diff --git a/modules/mga-mirrors/manifests/init.pp b/modules/mga-mirrors/manifests/init.pp index 40ad2cba..ce55538a 100644 --- a/modules/mga-mirrors/manifests/init.pp +++ b/modules/mga-mirrors/manifests/init.pp @@ -4,7 +4,7 @@ class mga-mirrors { package { 'mga-mirrors': } - apache::vhost_catalyst_app { $vhost: + apache::vhost::catalyst_app { $vhost: script => '/usr/bin/mga_mirrors_fastcgi.pl', require => Package['mga-mirrors'], } |