From 33acec18bca2597c84a4657e5d6c10e1cbab0cf8 Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Tue, 9 Jul 2013 12:22:22 +0100 Subject: [PATCH] Move the SPDemo stuff into examples area ... but do we still need it at all? --- etc/apache2/spdemo | 26 -------------------------- etc/apache2/spdemo-mike | 26 -------------------------- etc/apache2/spdemo-px | 21 --------------------- examples/apache2/spdemo | 26 ++++++++++++++++++++++++++ examples/apache2/spdemo-mike | 26 ++++++++++++++++++++++++++ examples/apache2/spdemo-px | 21 +++++++++++++++++++++ 6 files changed, 73 insertions(+), 73 deletions(-) delete mode 100644 etc/apache2/spdemo delete mode 100644 etc/apache2/spdemo-mike delete mode 100644 etc/apache2/spdemo-px create mode 100644 examples/apache2/spdemo create mode 100644 examples/apache2/spdemo-mike create mode 100644 examples/apache2/spdemo-px diff --git a/etc/apache2/spdemo b/etc/apache2/spdemo deleted file mode 100644 index cc187be..0000000 --- a/etc/apache2/spdemo +++ /dev/null @@ -1,26 +0,0 @@ -# Configuration for the apache web server -*- apache -*- - -# pazpar2 / service proxy config - - ServerName spdemo.example.com - ServerAlias spdemo-dev.indexdata.com spdemo-devel.indexdata.com spdemo-sp.indexdata.com spdemo-pp2.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/spdemo - - 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/spdemo-mike b/etc/apache2/spdemo-mike deleted file mode 100644 index 3654479..0000000 --- a/etc/apache2/spdemo-mike +++ /dev/null @@ -1,26 +0,0 @@ -# Configuration for the apache web server -*- apache -*- -# Running on Mike's local development box -# This file is a variant of "spdemo" - -# pazpar2 / service proxy config - - ServerName x.spdemo-sp.indexdata.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 /usr/local/src/git/mkws/experiments/spdemo/ - - 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/ - diff --git a/etc/apache2/spdemo-px b/etc/apache2/spdemo-px deleted file mode 100644 index 7f28300..0000000 --- a/etc/apache2/spdemo-px +++ /dev/null @@ -1,21 +0,0 @@ - - ServerName spdemo.indexdata.com - ServerAlias spdemo-dev.indexdata.com spdemo-devel.indexdata.com spdemo-sp.indexdata.com spdemo-pp2.indexdata.com spclient-dev.indexdata.com - - ErrorLog /var/log/apache2/spdemo-error.log - CustomLog /var/log/apache2/spdemo-access.log combined - - DefaultType text/html - - ProxyRequests off - ProxyPreserveHost On - - - Order deny,allow - Allow from all - - - ProxyPass / http://spdemo/ - ProxyPassReverse / http://spdemo/ - - diff --git a/examples/apache2/spdemo b/examples/apache2/spdemo new file mode 100644 index 0000000..cc187be --- /dev/null +++ b/examples/apache2/spdemo @@ -0,0 +1,26 @@ +# Configuration for the apache web server -*- apache -*- + +# pazpar2 / service proxy config + + ServerName spdemo.example.com + ServerAlias spdemo-dev.indexdata.com spdemo-devel.indexdata.com spdemo-sp.indexdata.com spdemo-pp2.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/spdemo + + 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/examples/apache2/spdemo-mike b/examples/apache2/spdemo-mike new file mode 100644 index 0000000..3654479 --- /dev/null +++ b/examples/apache2/spdemo-mike @@ -0,0 +1,26 @@ +# Configuration for the apache web server -*- apache -*- +# Running on Mike's local development box +# This file is a variant of "spdemo" + +# pazpar2 / service proxy config + + ServerName x.spdemo-sp.indexdata.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 /usr/local/src/git/mkws/experiments/spdemo/ + + 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/ + diff --git a/examples/apache2/spdemo-px b/examples/apache2/spdemo-px new file mode 100644 index 0000000..7f28300 --- /dev/null +++ b/examples/apache2/spdemo-px @@ -0,0 +1,21 @@ + + ServerName spdemo.indexdata.com + ServerAlias spdemo-dev.indexdata.com spdemo-devel.indexdata.com spdemo-sp.indexdata.com spdemo-pp2.indexdata.com spclient-dev.indexdata.com + + ErrorLog /var/log/apache2/spdemo-error.log + CustomLog /var/log/apache2/spdemo-access.log combined + + DefaultType text/html + + ProxyRequests off + ProxyPreserveHost On + + + Order deny,allow + Allow from all + + + ProxyPass / http://spdemo/ + ProxyPassReverse / http://spdemo/ + + -- 1.7.10.4