diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/2010-December/001088.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/2010-December/001088.html | 157 |
1 files changed, 157 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/2010-December/001088.html b/zarb-ml/mageia-sysadm/2010-December/001088.html new file mode 100644 index 000000000..47fa52d60 --- /dev/null +++ b/zarb-ml/mageia-sysadm/2010-December/001088.html @@ -0,0 +1,157 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> + <HEAD> + <TITLE> [Mageia-sysadm] [562] - use a variable for the robot and http vhost ( and force https in www + </TITLE> + <LINK REL="Index" HREF="index.html" > + <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B562%5D%20-%20use%20a%20variable%20for%20the%20robot%20and%20http%20vhost%0A%20%28%20and%20force%20https%20in%20www&In-Reply-To=%3C20101209123429.9CC543FEBC%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="001087.html"> + <LINK REL="Next" HREF="001089.html"> + </HEAD> + <BODY BGCOLOR="#ffffff"> + <H1>[Mageia-sysadm] [562] - use a variable for the robot and http vhost ( and force https in www</H1> + <B>root at mageia.org</B> + <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B562%5D%20-%20use%20a%20variable%20for%20the%20robot%20and%20http%20vhost%0A%20%28%20and%20force%20https%20in%20www&In-Reply-To=%3C20101209123429.9CC543FEBC%40valstar.mageia.org%3E" + TITLE="[Mageia-sysadm] [562] - use a variable for the robot and http vhost ( and force https in www">root at mageia.org + </A><BR> + <I>Thu Dec 9 13:34:29 CET 2010</I> + <P><UL> + <LI>Previous message: <A HREF="001087.html">[Mageia-sysadm] [561] - use the lib_dir fact +</A></li> + <LI>Next message: <A HREF="001089.html">[Mageia-sysadm] [563] add epoll selfsigned certificate +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#1088">[ date ]</a> + <a href="thread.html#1088">[ thread ]</a> + <a href="subject.html#1088">[ subject ]</a> + <a href="author.html#1088">[ author ]</a> + </LI> + </UL> + <HR> +<!--beginarticle--> +<PRE>Revision: 562 +Author: misc +Date: 2010-12-09 13:34:29 +0100 (Thu, 09 Dec 2010) +Log Message: +----------- +- use a variable for the robot and http vhost ( and force https in www + sympa config too ) + +Modified Paths: +-------------- + puppet/modules/sympa/manifests/init.pp + puppet/modules/sympa/templates/sympa.conf + +Modified: puppet/modules/sympa/manifests/init.pp +=================================================================== +--- puppet/modules/sympa/manifests/init.pp 2010-12-09 12:34:28 UTC (rev 561) ++++ puppet/modules/sympa/manifests/init.pp 2010-12-09 12:34:29 UTC (rev 562) +@@ -1,5 +1,9 @@ + class sympa { +- class server { ++ class variable { ++ $vhost = "ml.$domain" ++ } ++ ++ class server inherits variable { + # perl-CGI-Fast is needed for fast cgi + # perl-Socket6 is required by perl-IO-Socket-SSL + # (optional requirement) +@@ -49,13 +53,13 @@ + webapp_file => "sympa/webapp_sympa.conf", + } + +- apache::vhost_redirect_ssl { "ml.$domain": } ++ apache::vhost_redirect_ssl { "$vhost": } + +- apache::vhost_other_app { "ml.$domain": ++ apache::vhost_other_app { "$vhost": + vhost_file => "sympa/vhost_ml.conf", + } + +- openssl::self_signed_cert{ "ml.$domain": ++ openssl::self_signed_cert{ "$vhost": + directory => "/etc/ssl/apache/" + } + +@@ -80,6 +84,8 @@ + + define list($subject, $profile, $language = 'en') { + ++ include sympa::variable ++ + $xml_file = "/etc/sympa/lists_xml/$name.xml" + + file { "$xml_file": +@@ -88,7 +94,7 @@ + content => template('sympa/list.xml') + } + +- exec { "sympa.pl --create_list --robot=ml.$domain --input_file=$xml_file": ++ exec { "sympa.pl --create_list --robot=$sympa::variable::vhost --input_file=$xml_file": + refreshonly => true, + subscribe => File["$xml_file"] + } + +Modified: puppet/modules/sympa/templates/sympa.conf +=================================================================== +--- puppet/modules/sympa/templates/sympa.conf 2010-12-09 12:34:28 UTC (rev 561) ++++ puppet/modules/sympa/templates/sympa.conf 2010-12-09 12:34:29 UTC (rev 562) +@@ -86,11 +86,11 @@ + ###\\\\ General definition ////### + + ## Main robot hostname +-domain ml.<%= domain %> ++domain <%= vhost %> + + ## Listmasters email list comma separated + ## Sympa will associate listmaster privileges to these email addresses (mail and web interfaces). Some error reports may also be sent to these addresses. +-listmaster <A HREF="https://www.mageia.org/mailman/listinfo/mageia-sysadm">listmaster at ml.</A><%= domain %> ++listmaster listmaster@<%= vhost %> + + ## Local part of sympa email adresse + ## Effective address will be \[EMAIL\]@\[HOST\] +@@ -278,7 +278,7 @@ + ###\\\\ Web interface ////### + + ## Sympa's main page URL +-wwsympa_url <A HREF="http://ml.<%=">http://ml.<%=</A> domain %>/ ++wwsympa_url <A HREF="https://<%=">https://<%=</A> vhost %>/ + + ## If a spam filter (like spamassassin or j-chkmail) add a smtp headers to tag spams, name of this header (example X-Spam-Status) + antispam_tag_header_name X-Spam-Status +-------------- next part -------------- +An HTML attachment was scrubbed... +URL: </pipermail/mageia-sysadm/attachments/20101209/5ea67dbe/attachment.html> +</PRE> + + + + + + + + + +<!--endarticle--> + <HR> + <P><UL> + <!--threads--> + <LI>Previous message: <A HREF="001087.html">[Mageia-sysadm] [561] - use the lib_dir fact +</A></li> + <LI>Next message: <A HREF="001089.html">[Mageia-sysadm] [563] add epoll selfsigned certificate +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#1088">[ date ]</a> + <a href="thread.html#1088">[ thread ]</a> + <a href="subject.html#1088">[ subject ]</a> + <a href="author.html#1088">[ 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> |