[Mageia-sysadm] [168] - refactor catalyst application config using a common class ( catdap is next )

[root at mageia.org]

Revision: 168
Author:   misc
Date:     2010-11-06 00:41:36 +0100 (Sat, 06 Nov 2010)
Log Message:
-----------
- refactor catalyst application config using a common class ( catdap is next )

Modified Paths:
--------------
    puppet/modules/epoll/manifests/init.pp
    puppet/modules/mga-mirrors/manifests/init.pp

Removed Paths:
-------------
    puppet/modules/epoll/templates/epoll_vhost.conf
    puppet/modules/mga-mirrors/templates/mirrors_vhost.conf

Modified: puppet/modules/epoll/manifests/init.pp
===================================================================
--- puppet/modules/epoll/manifests/init.pp	2010-11-05 23:29:16 UTC (rev 167)
+++ puppet/modules/epoll/manifests/init.pp	2010-11-05 23:41:36 UTC (rev 168)
@@ -1,23 +1,15 @@
 class epoll {
 
-    include apache::mod_fastcgi
-
     $vhost = "epoll.$domain"
+
     package { 'Epoll':
         ensure => installed
     }
-
-    # add a apache vhost
-    file { "$vhost.conf":
-        path => "/etc/httpd/conf/vhosts.d/$vhost.conf",
-        ensure => "present",
-        owner => root,
-        group => root,
-        mode => 644,
-        notify => Service['apache'],
-        content => template("epoll/epoll_vhost.conf")
+    
+    apache::vhost_catalyst_app { $vhost:
+        script => /usr/bin/epoll_fastcgi.pl 
     }
- 
+     
     $password = extlookup("epoll_password")
  
     file { "epoll.yml": 

Deleted: puppet/modules/epoll/templates/epoll_vhost.conf
===================================================================
--- puppet/modules/epoll/templates/epoll_vhost.conf	2010-11-05 23:29:16 UTC (rev 167)
+++ puppet/modules/epoll/templates/epoll_vhost.conf	2010-11-05 23:41:36 UTC (rev 168)
@@ -1,13 +0,0 @@
-<VirtualHost *:80>
-        ServerName <%= vhost %>
-        # Serve static content directly
-        DocumentRoot  /dev/null
-
-        Alias / /usr/bin/epoll_fastcgi.pl/
-        FastCgiServer /usr/bin/epoll_fastcgi.pl -processes 4 -idle-timeout 30
-
-        <Location />
-            Allow from all
-        </Location>
-</VirtualHost>
-

Modified: puppet/modules/mga-mirrors/manifests/init.pp
===================================================================
--- puppet/modules/mga-mirrors/manifests/init.pp	2010-11-05 23:29:16 UTC (rev 167)
+++ puppet/modules/mga-mirrors/manifests/init.pp	2010-11-05 23:41:36 UTC (rev 168)
@@ -2,23 +2,14 @@
     
     $vhost = "mirrors.$domain"
 
-    include apache::mod_fastcgi
-
     package { 'mga-mirrors':
         ensure => installed
     }
 
-    # add a apache vhost
-    file { "$vhost.conf":
-        path => "/etc/httpd/conf/vhosts.d/$vhost.conf",
-        ensure => "present",
-        owner => root,
-        group => root,
-        mode => 644,
-        notify => Service['apache'],
-        content => template("mga-mirrors/mirrors_vhost.conf")
+    apache::vhost_catalyst_app { $vhost:
+        script => /usr/bin/mga_mirrors_fastcgi.pl 
     }
- 
+
     $password = extlookup("mga_mirror_password")
  
     file { "mga-mirrors.ini": 

Deleted: puppet/modules/mga-mirrors/templates/mirrors_vhost.conf
===================================================================
--- puppet/modules/mga-mirrors/templates/mirrors_vhost.conf	2010-11-05 23:29:16 UTC (rev 167)
+++ puppet/modules/mga-mirrors/templates/mirrors_vhost.conf	2010-11-05 23:41:36 UTC (rev 168)
@@ -1,13 +0,0 @@
-<VirtualHost *:80>
-        ServerName <%= vhost %>
-        # Serve static content directly
-        DocumentRoot  /dev/null
-
-        Alias / /usr/bin/mga_mirrors_fastcgi.pl/
-        FastCgiServer /usr/bin/mga_mirrors_fastcgi.pl -processes 4 -idle-timeout 30
-
-        <Location />
-            Allow from all
-        </Location>
-</VirtualHost>
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101106/d6a616a0/attachment.html>