You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by da...@apache.org on 2017/05/31 18:14:19 UTC

svn commit: r1797092 - in /spamassassin/trunk/build/automc: apache2.conf automc-apache2.conf

Author: davej
Date: Wed May 31 18:14:18 2017
New Revision: 1797092

URL: http://svn.apache.org/viewvc?rev=1797092&view=rev
Log:
Renamed DocRoot dir to automc for consistency

Added:
    spamassassin/trunk/build/automc/apache2.conf
Removed:
    spamassassin/trunk/build/automc/automc-apache2.conf

Added: spamassassin/trunk/build/automc/apache2.conf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/apache2.conf?rev=1797092&view=auto
==============================================================================
--- spamassassin/trunk/build/automc/apache2.conf (added)
+++ spamassassin/trunk/build/automc/apache2.conf Wed May 31 18:14:18 2017
@@ -0,0 +1,112 @@
+# Included in sa-vm1.apache.org:/etc/apache2/sites-available/automc.conf:
+#   Include /usr/local/spamassassin/automc/svn/automc/apache2.conf
+#
+# Update Apache config like so:
+#
+# On your local desktop/laptop:
+#   1. cd [local checkout of https://svn.apache.org/repos/asf/spamassassin/trunk/build/automc/]
+#   2. Update this file
+#   3. svn commit automc-apache2.conf -m "Comment"
+# On the sa-vm1.apache.org:
+#   4. sudo su -
+#   5. su - automc
+#   6. cd svn/automc
+#   7. svn up
+#   8. sudo systemctl restart apache2 || journalctl -u apache2
+
+# ---------------------------------------------------------------------------
+
+<IfModule mod_dir.c>
+    DirectoryIndex index.html index.htm index.shtml index.php index.php4 index.php3 index.phtml index.cgi
+</IfModule>
+
+# ---------------------------------------------------------------------------
+
+<VirtualHost *:80>
+  ServerName bbmass.spamassassin.org
+  ServerAlias buildbot.spamassassin.org
+  ServerAlias bbmass-trunk.spamassassin.org
+  ServerAlias bbmass-stable.spamassassin.org
+  <Directory /var/www/automc.spamassassin.org>
+    options indexes SymLinksIfOwnerMatch
+    AllowOverride indexes
+  </Directory>
+  DocumentRoot /var/www/automc.spamassassin.org
+  ServerAdmin webmaster@spamassassin.org
+</VirtualHost>
+
+# ---------------------------------------------------------------------------
+
+<VirtualHost *:80>
+  ServerName updatedist.spamassassin.org
+  <Directory /var/www/automc.spamassassin.org/updates>
+    options indexes SymLinksIfOwnerMatch
+    AllowOverride indexes
+  </Directory>
+  DocumentRoot /var/www/automc.spamassassin.org/updates
+  ServerAdmin webmaster@spamassassin.org
+</VirtualHost>
+
+# ---------------------------------------------------------------------------
+
+<VirtualHost *:80>
+  ServerName ruleqa.spamassassin.org
+  ServerAlias ruleqa-trunk.spamassassin.org
+  ServerAlias ruleqa-stable.spamassassin.org
+  <Directory /var/www/ruleqa.spamassassin.org>
+    options indexes SymLinksIfOwnerMatch
+    AllowOverride indexes
+  </Directory>
+  DocumentRoot /var/www/ruleqa.spamassassin.org
+  ServerAdmin webmaster@spamassassin.org
+
+  <Directory /usr/local/spamassassin/automc/svn/rule-qa/automc>
+    AllowOverride None
+    Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+    Require all granted
+  </Directory>
+
+  # debugging:
+  # RewriteLogLevel 9
+  # RewriteLog /var/apache2/logs/rewrite_log
+
+  # "%2F" is used to grep rule subsets, allow it
+  AllowEncodedSlashes On
+
+  # strip out known-local files and loops; all else goes to the ruleqa code
+  RewriteEngine On
+
+  # index: straight through
+  RewriteRule ^/$ /ruleqa.cgi [PT,L]
+
+  RewriteRule ^/ruleqa.css$ /ruleqa.css [PT,L]
+
+  # satisfy local files
+  RewriteCond /var/www/ruleqa.spamassassin.org/%{REQUEST_FILENAME} !-d
+  RewriteCond /var/www/ruleqa.spamassassin.org/%{REQUEST_FILENAME} !-f
+
+  # otherwise the CGI
+  RewriteCond %{REQUEST_URI} !^/ruleqa\.cgi
+  RewriteRule ^/(.*) /ruleqa.cgi/$1 [PT,L]
+
+  Alias /ruleqa.css /usr/local/spamassassin/automc/svn/rule-qa/automc/ruleqa.css
+  Alias /sorttable.js /usr/local/spamassassin/automc/svn/rule-qa/automc/sorttable.js
+  ScriptAlias /ruleqa.cgi /usr/local/spamassassin/automc/svn/rule-qa/automc/ruleqa.cgi
+
+</VirtualHost>
+
+# ---------------------------------------------------------------------------
+
+<VirtualHost *:80>
+  ServerName rsync.spamassassin.org
+  ServerAlias www-rsync.spamassassin.org
+  <Directory /usr/local/spamassassin/automc/rsync/corpus>
+    options indexes SymLinksIfOwnerMatch
+    AllowOverride indexes
+    Require all granted
+  </Directory>
+  DocumentRoot /usr/local/spamassassin/automc/rsync/corpus
+  ServerAdmin webmaster@spamassassin.org
+</VirtualHost>
+
+# ---------------------------------------------------------------------------