summaryrefslogtreecommitdiffstats
path: root/zarb-ml/mageia-sysadm/2011-January/001829.html
diff options
context:
space:
mode:
Diffstat (limited to 'zarb-ml/mageia-sysadm/2011-January/001829.html')
-rw-r--r--zarb-ml/mageia-sysadm/2011-January/001829.html157
1 files changed, 157 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/2011-January/001829.html b/zarb-ml/mageia-sysadm/2011-January/001829.html
new file mode 100644
index 000000000..2c9ff4e7f
--- /dev/null
+++ b/zarb-ml/mageia-sysadm/2011-January/001829.html
@@ -0,0 +1,157 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<HTML>
+ <HEAD>
+ <TITLE> [Mageia-sysadm] [747] move websites module to deployment
+ </TITLE>
+ <LINK REL="Index" HREF="index.html" >
+ <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B747%5D%20move%20websites%20module%20to%20deployment&In-Reply-To=%3C20110109111515.504BA41E3C%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="001827.html">
+ <LINK REL="Next" HREF="001830.html">
+ </HEAD>
+ <BODY BGCOLOR="#ffffff">
+ <H1>[Mageia-sysadm] [747] move websites module to deployment</H1>
+ <B>root at mageia.org</B>
+ <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B747%5D%20move%20websites%20module%20to%20deployment&In-Reply-To=%3C20110109111515.504BA41E3C%40valstar.mageia.org%3E"
+ TITLE="[Mageia-sysadm] [747] move websites module to deployment">root at mageia.org
+ </A><BR>
+ <I>Sun Jan 9 12:15:15 CET 2011</I>
+ <P><UL>
+ <LI>Previous message: <A HREF="001827.html">[Mageia-sysadm] [746] use mysql module, reindent the file to be consistent with space and more compact
+</A></li>
+ <LI>Next message: <A HREF="001830.html">[Mageia-sysadm] [748] remove leftover of git svn vs svn alone behavior ( ie, git do not track empty directory, while svn does )
+</A></li>
+ <LI> <B>Messages sorted by:</B>
+ <a href="date.html#1829">[ date ]</a>
+ <a href="thread.html#1829">[ thread ]</a>
+ <a href="subject.html#1829">[ subject ]</a>
+ <a href="author.html#1829">[ author ]</a>
+ </LI>
+ </UL>
+ <HR>
+<!--beginarticle-->
+<PRE>Revision: 747
+Author: misc
+Date: 2011-01-09 12:15:15 +0100 (Sun, 09 Jan 2011)
+Log Message:
+-----------
+move websites module to deployment
+
+Added Paths:
+-----------
+ puppet/deployment/websites/
+ puppet/deployment/websites/manifests/
+ puppet/deployment/websites/manifests/init.pp
+ puppet/deployment/websites/templates/
+ puppet/deployment/websites/templates/vhost_donate.conf
+
+Removed Paths:
+-------------
+ puppet/modules/websites/manifests/init.pp
+ puppet/modules/websites/templates/vhost_donate.conf
+
+Copied: puppet/deployment/websites/manifests/init.pp (from rev 746, puppet/modules/websites/manifests/init.pp)
+===================================================================
+--- puppet/deployment/websites/manifests/init.pp (rev 0)
++++ puppet/deployment/websites/manifests/init.pp 2011-01-09 11:15:15 UTC (rev 747)
+@@ -0,0 +1,8 @@
++class websites {
++ # should expire on June 2011
++ class donate {
++ apache::vhost_other_app { &quot;donate.$domain&quot;:
++ vhost_file =&gt; &quot;websites/vhost_donate.conf&quot;,
++ }
++ }
++}
+
+Copied: puppet/deployment/websites/templates/vhost_donate.conf (from rev 746, puppet/modules/websites/templates/vhost_donate.conf)
+===================================================================
+--- puppet/deployment/websites/templates/vhost_donate.conf (rev 0)
++++ puppet/deployment/websites/templates/vhost_donate.conf 2011-01-09 11:15:15 UTC (rev 747)
+@@ -0,0 +1,16 @@
++&lt;VirtualHost *:80&gt;
++ ServerName donate.&lt;%= domain %&gt;
++ ServerAlias donation.&lt;%= domain %&gt;
++
++ RewriteEngine on
++ RewriteRule ^/?$ <A HREF="http://www.&lt;%=">http://www.&lt;%=</A> domain %&gt;/en/donate/ [R=permanent,L]
++ RewriteRule ^/(.*)$ <A HREF="http://www.&lt;%=">http://www.&lt;%=</A> domain %&gt;/$1/donate/ [R=permanent,L]
++ #DocumentRoot /dev/null
++ CustomLog /var/log/httpd/donate_log combined
++ ErrorLog /var/log/httpd/error_donate_log
++
++ &lt;Location /&gt;
++ Allow from all
++ &lt;/Location&gt;
++
++&lt;/VirtualHost&gt;
+
+Deleted: puppet/modules/websites/manifests/init.pp
+===================================================================
+--- puppet/modules/websites/manifests/init.pp 2011-01-09 11:15:13 UTC (rev 746)
++++ puppet/modules/websites/manifests/init.pp 2011-01-09 11:15:15 UTC (rev 747)
+@@ -1,8 +0,0 @@
+-class websites {
+- # should expire on June 2011
+- class donate {
+- apache::vhost_other_app { &quot;donate.$domain&quot;:
+- vhost_file =&gt; &quot;websites/vhost_donate.conf&quot;,
+- }
+- }
+-}
+
+Deleted: puppet/modules/websites/templates/vhost_donate.conf
+===================================================================
+--- puppet/modules/websites/templates/vhost_donate.conf 2011-01-09 11:15:13 UTC (rev 746)
++++ puppet/modules/websites/templates/vhost_donate.conf 2011-01-09 11:15:15 UTC (rev 747)
+@@ -1,16 +0,0 @@
+-&lt;VirtualHost *:80&gt;
+- ServerName donate.&lt;%= domain %&gt;
+- ServerAlias donation.&lt;%= domain %&gt;
+-
+- RewriteEngine on
+- RewriteRule ^/?$ <A HREF="http://www.&lt;%=">http://www.&lt;%=</A> domain %&gt;/en/donate/ [R=permanent,L]
+- RewriteRule ^/(.*)$ <A HREF="http://www.&lt;%=">http://www.&lt;%=</A> domain %&gt;/$1/donate/ [R=permanent,L]
+- #DocumentRoot /dev/null
+- CustomLog /var/log/httpd/donate_log combined
+- ErrorLog /var/log/httpd/error_donate_log
+-
+- &lt;Location /&gt;
+- Allow from all
+- &lt;/Location&gt;
+-
+-&lt;/VirtualHost&gt;
+-------------- next part --------------
+An HTML attachment was scrubbed...
+URL: &lt;/pipermail/mageia-sysadm/attachments/20110109/8c64ab63/attachment.html&gt;
+</PRE>
+
+
+
+
+
+
+
+
+
+<!--endarticle-->
+ <HR>
+ <P><UL>
+ <!--threads-->
+ <LI>Previous message: <A HREF="001827.html">[Mageia-sysadm] [746] use mysql module, reindent the file to be consistent with space and more compact
+</A></li>
+ <LI>Next message: <A HREF="001830.html">[Mageia-sysadm] [748] remove leftover of git svn vs svn alone behavior ( ie, git do not track empty directory, while svn does )
+</A></li>
+ <LI> <B>Messages sorted by:</B>
+ <a href="date.html#1829">[ date ]</a>
+ <a href="thread.html#1829">[ thread ]</a>
+ <a href="subject.html#1829">[ subject ]</a>
+ <a href="author.html#1829">[ 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>