diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/2010-November/000290.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/2010-November/000290.html | 181 |
1 files changed, 181 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/2010-November/000290.html b/zarb-ml/mageia-sysadm/2010-November/000290.html new file mode 100644 index 000000000..d0ede1268 --- /dev/null +++ b/zarb-ml/mageia-sysadm/2010-November/000290.html @@ -0,0 +1,181 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> + <HEAD> + <TITLE> [Mageia-sysadm] [168] - refactor catalyst application config using a common class ( catdap is next ) + </TITLE> + <LINK REL="Index" HREF="index.html" > + <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B168%5D%20-%20refactor%20catalyst%20application%20config%20using%0A%20a%20common%20class%20%28%20catdap%20is%20next%20%29&In-Reply-To=%3C20101105234137.3DE0A3FBFC%40valstar.mageia.org%3E"> + <META NAME="robots" CONTENT="index,nofollow"> + <META http-equiv="Content-Type" content="text/html; charset=us-ascii"> + <LINK REL="Previous" HREF="000289.html"> + <LINK REL="Next" HREF="000291.html"> + </HEAD> + <BODY BGCOLOR="#ffffff"> + <H1>[Mageia-sysadm] [168] - refactor catalyst application config using a common class ( catdap is next )</H1> + <B>root at mageia.org</B> + <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B168%5D%20-%20refactor%20catalyst%20application%20config%20using%0A%20a%20common%20class%20%28%20catdap%20is%20next%20%29&In-Reply-To=%3C20101105234137.3DE0A3FBFC%40valstar.mageia.org%3E" + TITLE="[Mageia-sysadm] [168] - refactor catalyst application config using a common class ( catdap is next )">root at mageia.org + </A><BR> + <I>Sat Nov 6 00:41:37 CET 2010</I> + <P><UL> + <LI>Previous message: <A HREF="000289.html">[Mageia-sysadm] [167] - add a define to ease catalyst application deployement +</A></li> + <LI>Next message: <A HREF="000291.html">[Mageia-sysadm] [169] - oups, fix error +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#290">[ date ]</a> + <a href="thread.html#290">[ thread ]</a> + <a href="subject.html#290">[ subject ]</a> + <a href="author.html#290">[ author ]</a> + </LI> + </UL> + <HR> +<!--beginarticle--> +<PRE>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> +</PRE> + + + + +<!--endarticle--> + <HR> + <P><UL> + <!--threads--> + <LI>Previous message: <A HREF="000289.html">[Mageia-sysadm] [167] - add a define to ease catalyst application deployement +</A></li> + <LI>Next message: <A HREF="000291.html">[Mageia-sysadm] [169] - oups, fix error +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#290">[ date ]</a> + <a href="thread.html#290">[ thread ]</a> + <a href="subject.html#290">[ subject ]</a> + <a href="author.html#290">[ author ]</a> + </LI> + </UL> + +<hr> +<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm +mailing list</a><br> +</body></html> |