git://git.onelab.eu
/
myplc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Setting tag myplc-5.3-5
[myplc.git]
/
plc.d
/
httpd
diff --git
a/plc.d/httpd
b/plc.d/httpd
index
572176d
..
b14c76f
100755
(executable)
--- a/
plc.d/httpd
+++ b/
plc.d/httpd
@@
-46,7
+46,7
@@
case "$1" in
# set document root - not really useful on fedora but just in case
sed -i -e "s@^DocumentRoot.*@DocumentRoot \"$DocumentRoot\"@" $httpd_conf
# set document root - not really useful on fedora but just in case
sed -i -e "s@^DocumentRoot.*@DocumentRoot \"$DocumentRoot\"@" $httpd_conf
- # whether WWW is enabled or not :
+ # whether WWW is enabled or not :
if [ "$PLC_WWW_ENABLED" != "1" ] ; then
# avoid hitting drupal, that would try to connect to the db and create noise
disable_file $DocumentRoot/index.php
if [ "$PLC_WWW_ENABLED" != "1" ] ; then
# avoid hitting drupal, that would try to connect to the db and create noise
disable_file $DocumentRoot/index.php
@@
-61,7
+61,7
@@
case "$1" in
# Set open_basedir so as to avoid leaks
open_basedir="$DocumentRoot:/etc/planetlab/php:/usr/share/plc_api/php:/var/log/myslice:/var/tmp/bootmedium:/var/log/bm:/tmp"
sed -i -e "s@[;]*open_basedir =.*@open_basedir = \"$open_basedir\"@" $php_ini
# Set open_basedir so as to avoid leaks
open_basedir="$DocumentRoot:/etc/planetlab/php:/usr/share/plc_api/php:/var/log/myslice:/var/tmp/bootmedium:/var/log/bm:/tmp"
sed -i -e "s@[;]*open_basedir =.*@open_basedir = \"$open_basedir\"@" $php_ini
-
+
# for php-5.3 under fedora12, otherwise issues tons of warning messages
# Set timezone in php.ini if not already there
if grep '^;date.timezone' $php_ini >& /dev/null; then
# for php-5.3 under fedora12, otherwise issues tons of warning messages
# Set timezone in php.ini if not already there
if grep '^;date.timezone' $php_ini >& /dev/null; then
@@
-75,7
+75,7
@@
case "$1" in
## patch php.ini
# memory limit
## patch php.ini
# memory limit
- sed -i -e 's,^memory_limit = 32M *;,memory_limit = 80M ; patch myplc -- ,' $php_ini
+ sed -i -e 's,^memory_limit = 32M *;,memory_limit = 80M ; patch myplc -- ,' $php_ini
# log_errors : is On by default
# error_log
if ! grep '^error_log *=' $php_ini > /dev/null ; then
# log_errors : is On by default
# error_log
if ! grep '^error_log *=' $php_ini > /dev/null ; then
@@
-85,7
+85,8
@@
case "$1" in
fi
# configure php-fpm as well if present (starting with f27)
fi
# configure php-fpm as well if present (starting with f27)
- [ -d $php_fpm_dir ] && cat > $php_fpm_conf << EOF
+ if [ -d $php_fpm_dir ] ; then
+ cat > $php_fpm_conf << EOF
[www]
php_value[include_path] = $include_path
php_value[open_basedir] = $open_basedir
[www]
php_value[include_path] = $include_path
php_value[open_basedir] = $open_basedir
@@
-93,6
+94,11
@@
php_value[date.timezone] = GMT
php_value[short_open_tag] = On
php_value[memory_limit] = 80M
EOF
php_value[short_open_tag] = On
php_value[memory_limit] = 80M
EOF
+ # this is needed because otherwise, the first time
+ # we do this configuration, the service is already up
+ # and the config is usable only the second time
+ systemctl restart php-fpm
+ fi
# Disable default Listen directive
sed -i -e '/^Listen/d' $httpd_conf
# Disable default Listen directive
sed -i -e '/^Listen/d' $httpd_conf
@@
-131,7
+137,7
@@
EOF
if [ -z "${http_port}" ]; then
skip_http=1;
elif [ -z "${!http_port}" ]; then
if [ -z "${http_port}" ]; then
skip_http=1;
elif [ -z "${!http_port}" ]; then
- skip_http=1;
+ skip_http=1;
elif [ "${!http_port}" = "${!previous_http_port}" ] ; then
skip_http=1
fi
elif [ "${!http_port}" = "${!previous_http_port}" ] ; then
skip_http=1
fi
@@
-177,14
+183,14
@@
EOF
# with mod_python preferred
if rpm -q mod_python >& /dev/null ; then
configure_for_mod_python=true
# with mod_python preferred
if rpm -q mod_python >& /dev/null ; then
configure_for_mod_python=true
- elif rpm -q mod_wsgi >& /dev/null ; then
+ elif rpm -q mod_wsgi >& /dev/null
|| rpm -q python2-mod_wsgi >& /dev/null
; then
configure_for_mod_wsgi=true
else
echo "Requires mod_python or mod_wsgi.... exiting"
exit 1
fi
configure_for_mod_wsgi=true
else
echo "Requires mod_python or mod_wsgi.... exiting"
exit 1
fi
- # It would be tempting to use <IfModule> here
+ # It would be tempting to use <IfModule> here
# but early tests showed this could be tricky/fragile
# So let's hard-wire it for one module
# A lot of trial-and -error was involved in getting this that way...
# but early tests showed this could be tricky/fragile
# So let's hard-wire it for one module
# A lot of trial-and -error was involved in getting this that way...
@@
-243,7
+249,7
@@
EOF
# mod_wsgi location
<Location $PLC_API_PATH>
$(apache_forbid)
# mod_wsgi location
<Location $PLC_API_PATH>
$(apache_forbid)
-</Location>
+</Location>
EOF
fi
EOF
fi