From 39aa1afba01fe4a7cef82c0f13b3e389203996b8 Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Tue, 9 Jul 2013 12:24:36 +0100 Subject: [PATCH] Move tools Apache2 configuration into tools area --- etc/apache2/README | 5 ----- etc/apache2/mkws-dev | 26 -------------------------- etc/apache2/mkws-live | 39 --------------------------------------- etc/apache2/mkws-mike | 29 ----------------------------- etc/apache2/mkws-proxy | 19 ------------------- tools/apache2/README | 5 +++++ tools/apache2/mkws-dev | 26 ++++++++++++++++++++++++++ tools/apache2/mkws-live | 39 +++++++++++++++++++++++++++++++++++++++ tools/apache2/mkws-mike | 29 +++++++++++++++++++++++++++++ tools/apache2/mkws-proxy | 19 +++++++++++++++++++ 10 files changed, 118 insertions(+), 118 deletions(-) delete mode 100644 etc/apache2/README delete mode 100644 etc/apache2/mkws-dev delete mode 100644 etc/apache2/mkws-live delete mode 100644 etc/apache2/mkws-mike delete mode 100644 etc/apache2/mkws-proxy create mode 100644 tools/apache2/README create mode 100644 tools/apache2/mkws-dev create mode 100644 tools/apache2/mkws-live create mode 100644 tools/apache2/mkws-mike create mode 100644 tools/apache2/mkws-proxy diff --git a/etc/apache2/README b/etc/apache2/README deleted file mode 100644 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 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 - - 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/ - - - diff --git a/etc/apache2/mkws-live b/etc/apache2/mkws-live deleted file mode 100644 index dfa7ed4..0000000 --- a/etc/apache2/mkws-live +++ /dev/null @@ -1,39 +0,0 @@ -# Configuration for the apache web server -# Running on caliban - - - - 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 - - - - - 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 - - PerlOutputFilterHandler MyApache2::SetACAO - - diff --git a/etc/apache2/mkws-mike b/etc/apache2/mkws-mike deleted file mode 100644 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 - - - 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. - - Allow from all - - diff --git a/etc/apache2/mkws-proxy b/etc/apache2/mkws-proxy deleted file mode 100644 index 4e16c51..0000000 --- a/etc/apache2/mkws-proxy +++ /dev/null @@ -1,19 +0,0 @@ - - ServerName mkws.indexdata.com - ServerAlias somesite.indexdata.com - - ProxyRequests off - ProxyVia On - ProxyPreserveHost On - - Order deny,allow - Allow from all - - - 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 - diff --git a/tools/apache2/README b/tools/apache2/README new file mode 100644 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 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 + + 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/ + + + diff --git a/tools/apache2/mkws-live b/tools/apache2/mkws-live new file mode 100644 index 0000000..dfa7ed4 --- /dev/null +++ b/tools/apache2/mkws-live @@ -0,0 +1,39 @@ +# Configuration for the apache web server +# Running on caliban + + + + 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 + + + + + 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 + + PerlOutputFilterHandler MyApache2::SetACAO + + diff --git a/tools/apache2/mkws-mike b/tools/apache2/mkws-mike new file mode 100644 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 + + + 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. + + Allow from all + + diff --git a/tools/apache2/mkws-proxy b/tools/apache2/mkws-proxy new file mode 100644 index 0000000..4e16c51 --- /dev/null +++ b/tools/apache2/mkws-proxy @@ -0,0 +1,19 @@ + + ServerName mkws.indexdata.com + ServerAlias somesite.indexdata.com + + ProxyRequests off + ProxyVia On + ProxyPreserveHost On + + Order deny,allow + Allow from all + + + 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 + -- 1.7.10.4