git://git.onelab.eu
/
myplc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3c6215a
)
better varname
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Wed, 6 Feb 2013 15:11:45 +0000
(16:11 +0100)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Wed, 6 Feb 2013 15:11:45 +0000
(16:11 +0100)
plc.d/httpd
patch
|
blob
|
history
diff --git
a/plc.d/httpd
b/plc.d/httpd
index
412f637
..
8ac141d
100755
(executable)
--- a/
plc.d/httpd
+++ b/
plc.d/httpd
@@
-74,7
+74,7
@@
case "$1" in
# Disable default Listen directive
sed -i -e '/^Listen/d' $httpd_conf
# Disable default Listen directive
sed -i -e '/^Listen/d' $httpd_conf
- plc
api
_noslash=$(echo $PLC_API_PATH | sed -e s,/,,g)
+ plc
_api_path
_noslash=$(echo $PLC_API_PATH | sed -e s,/,,g)
# Set the port numbers
for server in WWW API BOOT ; do
enabled=PLC_${server}_ENABLED
# Set the port numbers
for server in WWW API BOOT ; do
enabled=PLC_${server}_ENABLED
@@
-125,7
+125,7
@@
Listen ${!http_port}
Redirect /planetlab https://$PLC_WWW_HOST:$PLC_WWW_SSL_PORT/planetlab
# as a matter of fact most xmlrpc clients won't follow the redirection
# so this is mostly rethorical, but just in case...
Redirect /planetlab https://$PLC_WWW_HOST:$PLC_WWW_SSL_PORT/planetlab
# as a matter of fact most xmlrpc clients won't follow the redirection
# so this is mostly rethorical, but just in case...
- Redirect /$plc
api_noslash https://$PLC_WWW_HOST:$PLC_WWW_SSL_PORT/$plcapi
_noslash
+ Redirect /$plc
_api_path_noslash https://$PLC_WWW_HOST:$PLC_WWW_SSL_PORT/$plc_api_path
_noslash
</VirtualHost>
EOF
</VirtualHost>
EOF
@@
-148,7
+148,7
@@
EOF
WSGISocketPrefix run/wsgi
<VirtualHost *:${!https_port}>
WSGISocketPrefix run/wsgi
<VirtualHost *:${!https_port}>
- WSGIScriptAlias /$plc
api
_noslash /usr/share/plc_api/apache/plc.wsgi
+ WSGIScriptAlias /$plc
_api_path
_noslash /usr/share/plc_api/apache/plc.wsgi
# xxx would be cool to be able to tweak this through config
WSGIDaemonProcess plcapi-wsgi-ssl user=apache group=apache processes=1 threads=25
WSGIProcessGroup plcapi-wsgi-ssl
# xxx would be cool to be able to tweak this through config
WSGIDaemonProcess plcapi-wsgi-ssl user=apache group=apache processes=1 threads=25
WSGIProcessGroup plcapi-wsgi-ssl