Move tools Apache2 configuration into tools area

diff --git a/etc/apache2/README b/etc/apache2/README
deleted file mode 100644 (file)
index 351fc7f..0000000
--- a/etc/apache2/README
+++ /dev/null
@@ -1,5 +0,0 @@
-You will need to enable the Rewrite module for this to work:
-
-$ sudo a2enmod rewrite
-$ sudo service apache2 reload
-

diff --git a/etc/apache2/mkws-dev b/etc/apache2/mkws-dev
deleted file mode 100644 (file)
index b4a7e8a..0000000
--- a/etc/apache2/mkws-dev
+++ /dev/null
@@ -1,26 +0,0 @@
-# Configuration for the apache web server                 -*- apache -*-
-
-# pazpar2 / service proxy config
-<VirtualHost *:80>
-    ServerName spclient.example.com
-    ServerAlias spclient-dev.indexdata.com
-    ServerAdmin webmaster@example.com
-    ErrorLog /var/log/apache2/spdemo-error.log
-    CustomLog /var/log/apache2/spdemo-access.log combined
-
-    RewriteEngine on
-    RewriteLogLevel 1
-    RewriteLog /var/log/apache2/spdemo-rewrite.log 
-
-    DocumentRoot /home/indexdata/mkws/experiments/spclient
-
-    RewriteRule /service-proxy-auth  /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
-
-    ProxyPass        /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
-    ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
-
-    ProxyPass        /pazpar2/         http://localhost:8004/pazpar2/
-    ProxyPassReverse /pazpar2/         http://localhost:8004/pazpar2/
-
-</VirtualHost>
-

diff --git a/etc/apache2/mkws-live b/etc/apache2/mkws-live
deleted file mode 100644 (file)
index dfa7ed4..0000000
--- a/etc/apache2/mkws-live
+++ /dev/null
@@ -1,39 +0,0 @@
-# Configuration for the apache web server
-# Running on caliban
-
-
-<VirtualHost *:80>
-    ServerName somesite.indexdata.com
-    DocumentRoot /home/indexdata/mkws/experiments/spclient/
-    ErrorLog /var/log/apache2/somesite-error.log
-    CustomLog /var/log/apache2/somesite-access.log combined
-</VirtualHost>
-
-
-<VirtualHost *:80>
-    ServerName mkws.indexdata.com
-
-    ErrorLog /var/log/apache2/mkws-error.log
-    CustomLog /var/log/apache2/mkws-access.log combined
-
-    DocumentRoot /home/indexdata/mkws/experiments/spclient/
-    Alias /libjs-pz2/ /home/indexdata/libjs-pz2/
-    Alias /index.html /home/indexdata/mkws/experiments/spclient/index-mkws.html
-
-    RewriteEngine on
-    RewriteLogLevel 1
-    RewriteLog /var/log/apache2/mkws-rewrite.log 
-    RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=demo&password=demo [P] # [NE,P]
-
-    Header set Access-Control-Allow-Credentials true
-
-    # For MKC Service Proxy
-    ProxyPass        /service-proxy/ http://mk2-test.indexdata.com/service-proxy/
-    ProxyPassReverse /service-proxy/ http://mk2-test.indexdata.com/service-proxy/
-
-    PerlOptions +Parent
-    PerlSwitches -I/home/indexdata/mkws/etc/mod_perl
-    <Location /service-proxy>
-        PerlOutputFilterHandler MyApache2::SetACAO
-    </Location>
-</VirtualHost>

diff --git a/etc/apache2/mkws-mike b/etc/apache2/mkws-mike
deleted file mode 100644 (file)
index 44efb2b..0000000
--- a/etc/apache2/mkws-mike
+++ /dev/null
@@ -1,29 +0,0 @@
-# Configuration for the apache web server
-# Running on Mike's local development box
-
-<VirtualHost *:80>
-    ServerName x.spclient.indexdata.com
-    ErrorLog /var/log/apache2/spclient-error.log
-    CustomLog /var/log/apache2/spclient-access.log combined
-
-    DocumentRoot /usr/local/src/git/mkws/experiments/spclient/
-    Alias /libjs-pz2/ /usr/local/src/git/libjs-pz2/
-
-    RewriteEngine on
-    RewriteLogLevel 1
-    RewriteLog /var/log/apache2/spclient-rewrite.log 
-    RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
-
-    # For MKC Service Proxy
-    ProxyPass        /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
-    ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
-
-    # For local Service Proxy running as mvn jetty:run
-    #ProxyPass        /service-proxy/ http://localhost:8585/service-proxy/
-    #ProxyPassReverse /service-proxy/ http://localhost:8585/service-proxy/
-
-    # Needed on Mac, which locks Apache down hard by default.
-    <Directory />
-        Allow from all
-    </Directory>
-</VirtualHost>

diff --git a/etc/apache2/mkws-proxy b/etc/apache2/mkws-proxy
deleted file mode 100644 (file)
index 4e16c51..0000000
--- a/etc/apache2/mkws-proxy
+++ /dev/null
@@ -1,19 +0,0 @@
-<VirtualHost *:80>
-    ServerName mkws.indexdata.com
-    ServerAlias somesite.indexdata.com
-
-    ProxyRequests off
-    ProxyVia On
-    ProxyPreserveHost On
-    <Proxy *>
-      Order deny,allow
-      Allow from all
-    </Proxy>
-
-    ProxyPass         / http://caliban:80/
-    ProxyPassReverse  / http://caliban:80/
-
-    # These are the logs for the proxying operation
-    ErrorLog /var/log/apache2/mkws-proxy-error.log
-    CustomLog /var/log/apache2/mkws-proxy-access.log combined
-</VirtualHost>

diff --git a/tools/apache2/README b/tools/apache2/README
new file mode 100644 (file)
index 0000000..351fc7f
--- /dev/null
+++ b/tools/apache2/README
@@ -0,0 +1,5 @@
+You will need to enable the Rewrite module for this to work:
+
+$ sudo a2enmod rewrite
+$ sudo service apache2 reload
+

diff --git a/tools/apache2/mkws-dev b/tools/apache2/mkws-dev
new file mode 100644 (file)
index 0000000..b4a7e8a
--- /dev/null
+++ b/tools/apache2/mkws-dev
@@ -0,0 +1,26 @@
+# Configuration for the apache web server                 -*- apache -*-
+
+# pazpar2 / service proxy config
+<VirtualHost *:80>
+    ServerName spclient.example.com
+    ServerAlias spclient-dev.indexdata.com
+    ServerAdmin webmaster@example.com
+    ErrorLog /var/log/apache2/spdemo-error.log
+    CustomLog /var/log/apache2/spdemo-access.log combined
+
+    RewriteEngine on
+    RewriteLogLevel 1
+    RewriteLog /var/log/apache2/spdemo-rewrite.log 
+
+    DocumentRoot /home/indexdata/mkws/experiments/spclient
+
+    RewriteRule /service-proxy-auth  /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
+
+    ProxyPass        /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
+    ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
+
+    ProxyPass        /pazpar2/         http://localhost:8004/pazpar2/
+    ProxyPassReverse /pazpar2/         http://localhost:8004/pazpar2/
+
+</VirtualHost>
+

diff --git a/tools/apache2/mkws-live b/tools/apache2/mkws-live
new file mode 100644 (file)
index 0000000..dfa7ed4
--- /dev/null
+++ b/tools/apache2/mkws-live
@@ -0,0 +1,39 @@
+# Configuration for the apache web server
+# Running on caliban
+
+
+<VirtualHost *:80>
+    ServerName somesite.indexdata.com
+    DocumentRoot /home/indexdata/mkws/experiments/spclient/
+    ErrorLog /var/log/apache2/somesite-error.log
+    CustomLog /var/log/apache2/somesite-access.log combined
+</VirtualHost>
+
+
+<VirtualHost *:80>
+    ServerName mkws.indexdata.com
+
+    ErrorLog /var/log/apache2/mkws-error.log
+    CustomLog /var/log/apache2/mkws-access.log combined
+
+    DocumentRoot /home/indexdata/mkws/experiments/spclient/
+    Alias /libjs-pz2/ /home/indexdata/libjs-pz2/
+    Alias /index.html /home/indexdata/mkws/experiments/spclient/index-mkws.html
+
+    RewriteEngine on
+    RewriteLogLevel 1
+    RewriteLog /var/log/apache2/mkws-rewrite.log 
+    RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=demo&password=demo [P] # [NE,P]
+
+    Header set Access-Control-Allow-Credentials true
+
+    # For MKC Service Proxy
+    ProxyPass        /service-proxy/ http://mk2-test.indexdata.com/service-proxy/
+    ProxyPassReverse /service-proxy/ http://mk2-test.indexdata.com/service-proxy/
+
+    PerlOptions +Parent
+    PerlSwitches -I/home/indexdata/mkws/etc/mod_perl
+    <Location /service-proxy>
+        PerlOutputFilterHandler MyApache2::SetACAO
+    </Location>
+</VirtualHost>

diff --git a/tools/apache2/mkws-mike b/tools/apache2/mkws-mike
new file mode 100644 (file)
index 0000000..44efb2b
--- /dev/null
+++ b/tools/apache2/mkws-mike
@@ -0,0 +1,29 @@
+# Configuration for the apache web server
+# Running on Mike's local development box
+
+<VirtualHost *:80>
+    ServerName x.spclient.indexdata.com
+    ErrorLog /var/log/apache2/spclient-error.log
+    CustomLog /var/log/apache2/spclient-access.log combined
+
+    DocumentRoot /usr/local/src/git/mkws/experiments/spclient/
+    Alias /libjs-pz2/ /usr/local/src/git/libjs-pz2/
+
+    RewriteEngine on
+    RewriteLogLevel 1
+    RewriteLog /var/log/apache2/spclient-rewrite.log 
+    RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
+
+    # For MKC Service Proxy
+    ProxyPass        /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
+    ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
+
+    # For local Service Proxy running as mvn jetty:run
+    #ProxyPass        /service-proxy/ http://localhost:8585/service-proxy/
+    #ProxyPassReverse /service-proxy/ http://localhost:8585/service-proxy/
+
+    # Needed on Mac, which locks Apache down hard by default.
+    <Directory />
+        Allow from all
+    </Directory>
+</VirtualHost>

diff --git a/tools/apache2/mkws-proxy b/tools/apache2/mkws-proxy
new file mode 100644 (file)
index 0000000..4e16c51
--- /dev/null
+++ b/tools/apache2/mkws-proxy
@@ -0,0 +1,19 @@
+<VirtualHost *:80>
+    ServerName mkws.indexdata.com
+    ServerAlias somesite.indexdata.com
+
+    ProxyRequests off
+    ProxyVia On
+    ProxyPreserveHost On
+    <Proxy *>
+      Order deny,allow
+      Allow from all
+    </Proxy>
+
+    ProxyPass         / http://caliban:80/
+    ProxyPassReverse  / http://caliban:80/
+
+    # These are the logs for the proxying operation
+    ErrorLog /var/log/apache2/mkws-proxy-error.log
+    CustomLog /var/log/apache2/mkws-proxy-access.log combined
+</VirtualHost>