diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/2010-November/000210.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/2010-November/000210.html | 149 |
1 files changed, 149 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/2010-November/000210.html b/zarb-ml/mageia-sysadm/2010-November/000210.html new file mode 100644 index 000000000..146da0616 --- /dev/null +++ b/zarb-ml/mageia-sysadm/2010-November/000210.html @@ -0,0 +1,149 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> + <HEAD> + <TITLE> [Mageia-sysadm] [97] - refactor the vhost + </TITLE> + <LINK REL="Index" HREF="index.html" > + <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B97%5D%20-%20refactor%20the%20vhost&In-Reply-To=%3C20101104175106.187D32B235%40krampouezh.mageia.org%3E"> + <META NAME="robots" CONTENT="index,nofollow"> + <META http-equiv="Content-Type" content="text/html; charset=us-ascii"> + <LINK REL="Previous" HREF="000209.html"> + <LINK REL="Next" HREF="000211.html"> + </HEAD> + <BODY BGCOLOR="#ffffff"> + <H1>[Mageia-sysadm] [97] - refactor the vhost</H1> + <B>root at mageia.org</B> + <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B97%5D%20-%20refactor%20the%20vhost&In-Reply-To=%3C20101104175106.187D32B235%40krampouezh.mageia.org%3E" + TITLE="[Mageia-sysadm] [97] - refactor the vhost">root at mageia.org + </A><BR> + <I>Thu Nov 4 18:51:06 CET 2010</I> + <P><UL> + <LI>Previous message: <A HREF="000209.html">[Mageia-sysadm] [96] - fix the service name ( as i cannot name it apache, i need to use a alias ) +</A></li> + <LI>Next message: <A HREF="000211.html">[Mageia-sysadm] [98] - move the call to extlookup before the template, not after +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#210">[ date ]</a> + <a href="thread.html#210">[ thread ]</a> + <a href="subject.html#210">[ subject ]</a> + <a href="author.html#210">[ author ]</a> + </LI> + </UL> + <HR> +<!--beginarticle--> +<PRE>Revision: 97 +Author: misc +Date: 2010-11-04 18:51:05 +0100 (Thu, 04 Nov 2010) +Log Message: +----------- +- refactor the vhost +- fix the url used for svn checkout +- add a requires from catdap config to svn checkout for ordering purpose +- move extlookup call outside of template +- fix the name of apache config file +- fix the naming of the ldap server + +Modified Paths: +-------------- + puppet/modules/catdap/manifests/init.pp + puppet/modules/catdap/templates/catdap_local.yml + puppet/modules/catdap/templates/catdap_vhost.conf + +Modified: puppet/modules/catdap/manifests/init.pp +=================================================================== +--- puppet/modules/catdap/manifests/init.pp 2010-11-04 17:42:21 UTC (rev 96) ++++ puppet/modules/catdap/manifests/init.pp 2010-11-04 17:51:05 UTC (rev 97) +@@ -5,6 +5,7 @@ + include apache::mod_fcgid + + $catdap_location = "/var/www/identity" ++ $catdap_vhost = "identity.$domain" + + # TODO switch to a proper rpm packaging + $rpm_requirement = ['perl-Catalyst-Runtime', +@@ -19,7 +20,7 @@ + } + + subversion::snapshot { $catdap_location: +- source => "svn+<A HREF="ssh://svn.mageia.org/srv/mx2-dd0/svn/soft/identity/CatDap/branches/live">ssh://svn.mageia.org/srv/mx2-dd0/svn/soft/identity/CatDap/branches/live</A>" ++ source => "<A HREF="svn://svn.mageia.org/soft/identity/CatDap/branches/live">svn://svn.mageia.org/soft/identity/CatDap/branches/live</A>" + } + + # add a catdap config file +@@ -27,12 +28,14 @@ + ensure => present, + owner => apache, + mode => 600, +- content => template("catdap/catdap_local.yml") ++ content => template("catdap/catdap_local.yml"), ++ require => Subversion::Snapshot[$catdap_location] + } + ++ $catdap_password = extlookup('catdap_password') + # add a apache vhost +- file { "identity.$domain.conf": +- path => "/etc/httpd/conf/vhosts.d/$name", ++ file { "$catdap_vhost.conf": ++ path => "/etc/httpd/conf/vhosts.d/$catdap_vhost.conf", + ensure => "present", + owner => root, + group => root, + +Modified: puppet/modules/catdap/templates/catdap_local.yml +=================================================================== +--- puppet/modules/catdap/templates/catdap_local.yml 2010-11-04 17:42:21 UTC (rev 96) ++++ puppet/modules/catdap/templates/catdap_local.yml 2010-11-04 17:51:05 UTC (rev 97) +@@ -3,9 +3,9 @@ + + dc_suffix = 'dc=' + domain.gsub('.',',dc=') + +-ldap_server = 'ldap' + domain ++ldap_server = 'ldap.' + domain + +-ldap_password = extlookup('catdap_password') ++ldap_password = catdap_password + + ldap_account = 'cn=catdap-valstar,ou=System Accounts,' + dc_suffix + %> + +Modified: puppet/modules/catdap/templates/catdap_vhost.conf +=================================================================== +--- puppet/modules/catdap/templates/catdap_vhost.conf 2010-11-04 17:42:21 UTC (rev 96) ++++ puppet/modules/catdap/templates/catdap_vhost.conf 2010-11-04 17:51:05 UTC (rev 97) +@@ -1,5 +1,5 @@ + <VirtualHost *:80> +- ServerName identity.<%= domain %> ++ ServerName <%= catdap_vhost %> + # Serve static content directly + DocumentRoot <%= catdap_location %>/root + Alias /static <%= catdap_location %>/root/static +-------------- next part -------------- +An HTML attachment was scrubbed... +URL: </pipermail/mageia-sysadm/attachments/20101104/3ce91e85/attachment.html> +</PRE> + + + + + + +<!--endarticle--> + <HR> + <P><UL> + <!--threads--> + <LI>Previous message: <A HREF="000209.html">[Mageia-sysadm] [96] - fix the service name ( as i cannot name it apache, i need to use a alias ) +</A></li> + <LI>Next message: <A HREF="000211.html">[Mageia-sysadm] [98] - move the call to extlookup before the template, not after +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#210">[ date ]</a> + <a href="thread.html#210">[ thread ]</a> + <a href="subject.html#210">[ subject ]</a> + <a href="author.html#210">[ 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> |