Platonides has uploaded a new change for review.
https://gerrit.wikimedia.org/r/50011
Change subject: Configuration for webtools-apache VMs
......................................................................
Configuration for webtools-apache VMs
Change-Id: I5491445c0c0e68163e2c960fd71ceda721da1cbf
---
A modules/webtools/files/apache-default
A modules/webtools/manifests/apache.pp
2 files changed, 55 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/11/50011/1
diff --git a/modules/webtools/files/apache-default
b/modules/webtools/files/apache-default
new file mode 100644
index 0000000..2a744d0
--- /dev/null
+++ b/modules/webtools/files/apache-default
@@ -0,0 +1,43 @@
+<VirtualHost *:80>
+ ServerAdmin webmaster@localhost
+
+ DocumentRoot /data/project
+
+ RewriteEngine On
+ RewriteRule ^/~([^/]+)(.*)$ /data/project/user/$1/public_html$2 [L]
+ RewriteRule ^/([^/]+)(.*)$ /web/$1/public_html$2 [L]
+ #RewriteLog /var/log/apache2/rewrite.log
+ #RewriteLogLevel 3
+
+ <Directory />
+ Options FollowSymLinks
+ AllowOverride None
+ Order deny,allow
+ Deny from all
+ </Directory>
+
+ # Tools should live in /data/project/web/
+ <Directory /data/project/web/*/public_html>
+ Options Indexes FollowSymLinks
+ AllowOverride All
+ Order allow,deny
+ allow from all
+ </Directory>
+
+ # User-specific data, temporary urls for eg. debug
+ <Directory /data/project/user/*/public_html/>
+ Options Indexes FollowSymLinks
+ AllowOverride All
+ Order allow,deny
+ allow from all
+ </Directory>
+
+ ErrorLog ${APACHE_LOG_DIR}/error.log
+
+ # Possible values include: debug, info, notice, warn, error, crit,
+ # alert, emerg.
+ LogLevel warn
+
+ CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+</VirtualHost>
diff --git a/modules/webtools/manifests/apache.pp
b/modules/webtools/manifests/apache.pp
new file mode 100644
index 0000000..59f941a
--- /dev/null
+++ b/modules/webtools/manifests/apache.pp
@@ -0,0 +1,12 @@
+class webtools::apache {
+ include webserver::php5
+
+ file {
+ "/etc/apache2/sites-available/default":
+ source =>
"puppet:///modules/webtools/files/apache-default",
+ "/etc/apache2/sites-enabled/000-default":
+ ensure => link,
+ target => "/etc/apache2/sites-available/default"
+ }
+}
+
--
To view, visit https://gerrit.wikimedia.org/r/50011
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5491445c0c0e68163e2c960fd71ceda721da1cbf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Platonides <platoni...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
