[Mageia-sysadm] [747] move websites module to deployment

[root at mageia.org]

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 { "donate.$domain":
+            vhost_file => "websites/vhost_donate.conf",
+        }
+    }
+}

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 @@
+<VirtualHost *:80>
+    ServerName donate.<%= domain %>
+    ServerAlias donation.<%= domain %>
+
+    RewriteEngine on
+    RewriteRule ^/?$ http://www.<%= domain %>/en/donate/ [R=permanent,L]
+    RewriteRule ^/(.*)$ http://www.<%= domain %>/$1/donate/ [R=permanent,L]
+    #DocumentRoot /dev/null
+    CustomLog /var/log/httpd/donate_log combined
+    ErrorLog  /var/log/httpd/error_donate_log
+ 
+    <Location />
+       Allow from all
+    </Location>
+
+</VirtualHost>

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 { "donate.$domain":
-            vhost_file => "websites/vhost_donate.conf",
-        }
-    }
-}

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 @@
-<VirtualHost *:80>
-    ServerName donate.<%= domain %>
-    ServerAlias donation.<%= domain %>
-
-    RewriteEngine on
-    RewriteRule ^/?$ http://www.<%= domain %>/en/donate/ [R=permanent,L]
-    RewriteRule ^/(.*)$ http://www.<%= domain %>/$1/donate/ [R=permanent,L]
-    #DocumentRoot /dev/null
-    CustomLog /var/log/httpd/donate_log combined
-    ErrorLog  /var/log/httpd/error_donate_log
- 
-    <Location />
-       Allow from all
-    </Location>
-
-</VirtualHost>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110109/8c64ab63/attachment.html>