Hello community, here is the log from the commit of package apache-rex for openSUSE:Factory checked in at 2019-12-07 15:15:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache-rex (Old) and /work/SRC/openSUSE:Factory/.apache-rex.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-rex" Sat Dec 7 15:15:08 2019 rev:16 rq:753282 version:20191203 Changes: -------- --- /work/SRC/openSUSE:Factory/apache-rex/apache-rex.changes 2019-11-03 10:30:55.489018900 +0100 +++ /work/SRC/openSUSE:Factory/.apache-rex.new.4691/apache-rex.changes 2019-12-07 15:15:45.703792668 +0100 @@ -1,0 +2,9 @@ +Tue Dec 3 13:34:14 UTC 2019 - pgaj...@suse.com + +- version update to 20191203 + * add uwsgi support + * new + . mod_proxy_uwsgi-basic + . mod_wsgi-basic + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache-rex.spec ++++++ --- /var/tmp/diff_new_pack.MKMo9Z/_old 2019-12-07 15:15:49.843792082 +0100 +++ /var/tmp/diff_new_pack.MKMo9Z/_new 2019-12-07 15:15:49.855792080 +0100 @@ -1,7 +1,7 @@ # # spec file for package apache-rex # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,12 +25,12 @@ %define macros_file macros.apache-rex Name: apache-rex -Version: 20191022 +Version: 20191203 Release: 0 Summary: Script for Apache HTTPD Runnable Examples License: Apache-2.0 Group: Documentation/Howto -Url: https://github.com/pgajdos/apache-rex +URL: https://github.com/pgajdos/apache-rex Source0: %{name}.tar.bz2 Source1: apache-rex-rpmlintrc Source2: %{macros_file} ++++++ apache-rex.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/.gitignore new/apache-rex/.gitignore --- old/apache-rex/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/.gitignore 2019-12-03 15:07:08.553824848 +0100 @@ -0,0 +1 @@ +*.swp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/README.md new/apache-rex/README.md --- old/apache-rex/README.md 2019-10-22 08:18:35.629562689 +0200 +++ new/apache-rex/README.md 2019-12-03 15:07:08.565824914 +0100 @@ -154,5 +154,5 @@ Full path to `sed` command (required for some Filter example definitions). * `AREX_ROTATELOGS_COMMAND` Full path to `rotatelogs` or `rotatelogs2` command (required e. g. in piped logs). -* `AREX_SOFTHSM2_SO` - mailny used in lib/softhsm, it is softhsm shared library module +* `AREX_SOFTHSM2_SO` + Mainly used in lib/softhsm, it is softhsm shared library module. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/contents new/apache-rex/contents --- old/apache-rex/contents 2019-10-22 08:18:35.613562599 +0200 +++ new/apache-rex/contents 2019-12-03 15:07:08.565824914 +0100 @@ -84,6 +84,8 @@ mod_proxy_ftp-basic mod_proxy_fcgi-basic mod_proxy_fcgi-sock +mod_wsgi-basic +mod_proxy_uwsgi-basic mod_php-basic mod_proxy_fcgi-php-fpm mod_proxy_fcgi-php-fpm-CGIPassAuth diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_proxy_uwsgi-basic/BINARIES new/apache-rex/mod_proxy_uwsgi-basic/BINARIES --- old/apache-rex/mod_proxy_uwsgi-basic/BINARIES 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_proxy_uwsgi-basic/BINARIES 2019-12-03 15:07:08.565824914 +0100 @@ -0,0 +1 @@ +uwsgi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_proxy_uwsgi-basic/DESCRIPTION new/apache-rex/mod_proxy_uwsgi-basic/DESCRIPTION --- old/apache-rex/mod_proxy_uwsgi-basic/DESCRIPTION 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_proxy_uwsgi-basic/DESCRIPTION 2019-12-03 15:07:08.565824914 +0100 @@ -0,0 +1 @@ +How to connect via proxy module to uwsgi server. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_proxy_uwsgi-basic/MODULES new/apache-rex/mod_proxy_uwsgi-basic/MODULES --- old/apache-rex/mod_proxy_uwsgi-basic/MODULES 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_proxy_uwsgi-basic/MODULES 2019-12-03 15:07:08.565824914 +0100 @@ -0,0 +1 @@ +proxy proxy_uwsgi proxy_http diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_proxy_uwsgi-basic/example.conf.in new/apache-rex/mod_proxy_uwsgi-basic/example.conf.in --- old/apache-rex/mod_proxy_uwsgi-basic/example.conf.in 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_proxy_uwsgi-basic/example.conf.in 2019-12-03 15:07:08.565824914 +0100 @@ -0,0 +1,2 @@ +ProxyPass "/uwsgi/" "uwsgi://localhost:@AREX_UWSGI_PORT@/" +ProxyPass "/http/" "http://localhost:@AREX_UWSGI_PORT2@/"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_proxy_uwsgi-basic/helloworld.py new/apache-rex/mod_proxy_uwsgi-basic/helloworld.py --- old/apache-rex/mod_proxy_uwsgi-basic/helloworld.py 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_proxy_uwsgi-basic/helloworld.py 2019-12-03 15:07:08.565824914 +0100 @@ -0,0 +1,5 @@ +# https://uwsgi-docs.readthedocs.io/en/latest/WSGIquickstart.html +def application(env, start_response): + start_response('200 OK', [('Content-Type','text/html')]) + return [b"Hello World!\n"] + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_proxy_uwsgi-basic/run.sh new/apache-rex/mod_proxy_uwsgi-basic/run.sh --- old/apache-rex/mod_proxy_uwsgi-basic/run.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_proxy_uwsgi-basic/run.sh 2019-12-03 15:07:08.565824914 +0100 @@ -0,0 +1,47 @@ +exit_code=0 + +# install an application +cp helloworld.py $AREX_RUN_DIR/ +# start uwsgi daemons +echo -n "Starting first uWSGI daemon (speaks uwsgi) .. " +uwsgi --plugin $AREX_UWSGI_PLUGIN_PYTHON \ + --socket localhost:$AREX_UWSGI_PORT \ + --wsgi-file $AREX_RUN_DIR/helloworld.py \ + --pidfile $AREX_RUN_DIR/uwsgi-1.pid \ + --logto $AREX_RUN_DIR/uwsgi-1.log & +sleep 1 +if [ -e "$AREX_RUN_DIR/uwsgi-1.pid" ]; then + echo "$(cat $AREX_RUN_DIR/uwsgi-1.pid)." +else + echo "FAILED, see $AREX_RUN_DIR/uwsgi-1.log." + exit 1 +fi +echo -n "Starting second uWSGI daemon (speaks http) .. " +uwsgi --plugin $AREX_UWSGI_PLUGIN_PYTHON,$AREX_UWSGI_PLUGIN_HTTP \ + --http localhost:$AREX_UWSGI_PORT2 \ + --wsgi-file $AREX_RUN_DIR/helloworld.py \ + --pidfile $AREX_RUN_DIR/uwsgi-2.pid \ + --logto $AREX_RUN_DIR/uwsgi-2.log & +sleep 1 +if [ -e "$AREX_RUN_DIR/uwsgi-2.pid" ]; then + echo "$(cat $AREX_RUN_DIR/uwsgi-2.pid)." +else + echo "FAILED, see $AREX_RUN_DIR/uwsgi-2.log." + exit 1 +fi +echo + +echo "[1] run an uWSGI application, uwsgi protocol" +curl -s http://localhost:$AREX_PORT/uwsgi/ | grep "Hello World!" || exit_code=1 + +echo "[2] run an uWSGI application, http protocol" +curl -s http://localhost:$AREX_PORT/http/ | grep "Hello World!" || exit_code=2 + +# stop uwsgi daemon +echo +echo -n "Stopping uWSGI daemons .. " +kill $(cat $AREX_RUN_DIR/uwsgi-1.pid) $(cat $AREX_RUN_DIR/uwsgi-2.pid) \ + && echo -n 'done.' || echo 'FAILED.' + +exit $exit_code + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_proxy_uwsgi-basic/skip.sh new/apache-rex/mod_proxy_uwsgi-basic/skip.sh --- old/apache-rex/mod_proxy_uwsgi-basic/skip.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_proxy_uwsgi-basic/skip.sh 2019-12-03 15:07:08.565824914 +0100 @@ -0,0 +1,2 @@ +# REASON: uwsgi does not have http or a python plugin +exit $([ -z "$AREX_UWSGI_PLUGIN_HTTP" -o -z "$AREX_UWSGI_PLUGIN_PYTHON" ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_wsgi-basic/DESCRIPTION new/apache-rex/mod_wsgi-basic/DESCRIPTION --- old/apache-rex/mod_wsgi-basic/DESCRIPTION 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_wsgi-basic/DESCRIPTION 2019-12-03 15:07:08.609825158 +0100 @@ -0,0 +1 @@ +How to run the WSGI script without an extra daemon. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_wsgi-basic/MODULES new/apache-rex/mod_wsgi-basic/MODULES --- old/apache-rex/mod_wsgi-basic/MODULES 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_wsgi-basic/MODULES 2019-12-03 15:07:08.609825158 +0100 @@ -0,0 +1 @@ +wsgi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_wsgi-basic/example.conf.in new/apache-rex/mod_wsgi-basic/example.conf.in --- old/apache-rex/mod_wsgi-basic/example.conf.in 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_wsgi-basic/example.conf.in 2019-12-03 15:07:08.609825158 +0100 @@ -0,0 +1,3 @@ +# https://www.shellhacks.com/modwsgi-hello-world-example/ +WSGIScriptAlias /helloapp @AREX_RUN_DIR@/helloworld.py + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_wsgi-basic/helloworld.py new/apache-rex/mod_wsgi-basic/helloworld.py --- old/apache-rex/mod_wsgi-basic/helloworld.py 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_wsgi-basic/helloworld.py 2019-12-03 15:07:08.609825158 +0100 @@ -0,0 +1,5 @@ +# https://uwsgi-docs.readthedocs.io/en/latest/WSGIquickstart.html +def application(env, start_response): + start_response('200 OK', [('Content-Type','text/html')]) + return [b"Hello World!\n"] + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/BINARIES new/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/BINARIES --- old/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/BINARIES 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/BINARIES 2019-12-03 15:07:08.605825135 +0100 @@ -0,0 +1 @@ +uwsgi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/DESCRIPTION new/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/DESCRIPTION --- old/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/DESCRIPTION 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/DESCRIPTION 2019-12-03 15:07:08.609825158 +0100 @@ -0,0 +1 @@ +How to connect to uwsgi server via uwsgi module. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/MODULES new/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/MODULES --- old/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/MODULES 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/MODULES 2019-12-03 15:07:08.605825135 +0100 @@ -0,0 +1 @@ +uwsgi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/example.conf.in new/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/example.conf.in --- old/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/example.conf.in 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/example.conf.in 2019-12-03 15:07:08.609825158 +0100 @@ -0,0 +1 @@ +uWSGIServer 127.0.0.1:@AREX_UWSGI_PORT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/helloworld.py new/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/helloworld.py --- old/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/helloworld.py 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/helloworld.py 2019-12-03 15:07:08.605825135 +0100 @@ -0,0 +1,5 @@ +# https://uwsgi-docs.readthedocs.io/en/latest/WSGIquickstart.html +def application(env, start_response): + start_response('200 OK', [('Content-Type','text/html')]) + return [b"Hello World!\n"] + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/run.sh new/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/run.sh --- old/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/run.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/run.sh 2019-12-03 15:07:08.609825158 +0100 @@ -0,0 +1,30 @@ +exit_code=0 + +# install an application +cp helloworld.py $AREX_RUN_DIR/ +# start uwsgi daemons +echo -n "Starting first uWSGI daemon (speaks uwsgi) .. " +uwsgi --plugin $AREX_UWSGI_PLUGIN_PYTHON \ + --socket localhost:$AREX_UWSGI_PORT \ + --wsgi-file $AREX_RUN_DIR/helloworld.py \ + --pidfile $AREX_RUN_DIR/uwsgi.pid \ + --logto $AREX_RUN_DIR/uwsgi.log & +sleep 1 +if [ -e "$AREX_RUN_DIR/uwsgi.pid" ]; then + echo "$(cat $AREX_RUN_DIR/uwsgi.pid)." +else + echo "FAILED, see $AREX_RUN_DIR/uwsgi.log." + exit 1 +fi + +echo "[1] run an uWSGI application, uwsgi protocol" +curl -s http://localhost:$AREX_PORT/ #| grep "Hello World!" || exit_code=1 + +# stop uwsgi daemon +echo +echo -n "Stopping uWSGI daemons .. " +kill $(cat $AREX_RUN_DIR/uwsgi.pid) \ + && echo -n 'done.' || echo 'FAILED.' + +exit $exit_code + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/skip.sh new/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/skip.sh --- old/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/skip.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_wsgi-basic/mod_uwsgi-basic/skip.sh 2019-12-03 15:07:08.609825158 +0100 @@ -0,0 +1,2 @@ +# REASON: uwsgi does not have http or a python plugin +exit $([ -z "$AREX_UWSGI_PLUGIN_PYTHON" ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/mod_wsgi-basic/run.sh new/apache-rex/mod_wsgi-basic/run.sh --- old/apache-rex/mod_wsgi-basic/run.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/apache-rex/mod_wsgi-basic/run.sh 2019-12-03 15:07:08.609825158 +0100 @@ -0,0 +1,11 @@ +exit_code=0 + +# install an application +cp helloworld.py $AREX_RUN_DIR/ + +echo "[1] run an uWSGI application" +curl -s http://localhost:$AREX_PORT/helloapp | grep "Hello World!" || exit_code=1 + +exit $exit_code + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache-rex/run-rex new/apache-rex/run-rex --- old/apache-rex/run-rex 2019-10-22 08:18:35.629562689 +0200 +++ new/apache-rex/run-rex 2019-12-03 15:07:08.565824914 +0100 @@ -91,6 +91,16 @@ SCGI_PORT=60004 fi +# port where uwsgi daemon can listen +if [ -z "$UWSGI_PORT" ]; then + UWSGI_PORT=60005 +fi + +# port where second uwsgi daemon can listen +if [ -z "$UWSGI_PORT2" ]; then + UWSGI_PORT2=60006 +fi + if [ -z "$OCSP_PORT"]; then OCSP_PORT=60888 fi @@ -306,6 +316,19 @@ vsftpd -v 0>&1 | sed 's:.*\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:' | tr -d '.' } +function uwsgi_command() +{ + which uwsgi 2>/dev/null +} + +UWSGI_PLUGINS_DIRS='/usr/lib64/uwsgi /usr/lib/uwsgi' + +function uwsgi_plugin() +{ + plugin=$1 + ls $UWSGI_PLUGINS_DIRS 2>/dev/null | grep $1 | head -n 1 | sed 's/_plugin.so//' +} + function openssl_an_engine() { openssl engine | grep -v dynamic | head -n 1 | sed 's:^(\([^()]*\)).*:\1:' @@ -438,6 +461,8 @@ echod -n '.' VSFTPD_COMMAND=$(vsftpd_command) register_command "$VSFTPD_COMMAND" vsftpd + UWSGI_COMMAND=$(uwsgi_command) + register_command "$UWSGI_COMMAND" uwsgi echod -n '.' # filter definitions need full path, otherwise # it is expected that sed is in the PATH @@ -480,6 +505,10 @@ echod -n '.' export AREX_VSFTPD_VERSION=$(vsftpd_version) fi + export AREX_UWSGI_PLUGIN_HTTP=$(uwsgi_plugin http) + echod -n '.' + export AREX_UWSGI_PLUGIN_PYTHON=$(uwsgi_plugin python) + echod -n '.' echod ' done.' echod "httpd command ............................ $HTTPD_COMMAND" @@ -514,6 +543,9 @@ echod "lsof command ............................. $LSOF_COMMAND" echod "vsftpd command ........................... $VSFTPD_COMMAND" echod "vsftpd version ........................... $AREX_VSFTPD_VERSION" + echod "uwsgi command ............................ $UWSGI_COMMAND" + echod "uwsgi http plugin ........................ $AREX_UWSGI_PLUGIN_HTTP" + echod "uwsgi python plugin ...................... $AREX_UWSGI_PLUGIN_PYTHON" echod "system have python-tornado ............... $AREX_HAVE_PYTHON_TORNADO" echod "system have perl-scgi .................... $AREX_HAVE_PERL_SCGI" echod "system have python-websocket-client ...... $AREX_HAVE_PYTHON_WEBSOCKET_CLIENT" @@ -575,6 +607,12 @@ export AREX_SCGI_PORT=$SCGI_PORT echod "scgi daemon will listen on ............... $AREX_SCGI_PORT" + export AREX_UWSGI_PORT=$UWSGI_PORT + echod "uwsgi daemon will listen on .............. $AREX_UWSGI_PORT" + + export AREX_UWSGI_PORT2=$UWSGI_PORT2 + echod "second uwsgi daemon will listen on ....... $AREX_UWSGI_PORT2" + export AREX_OCSP_PORT=$OCSP_PORT echod "ocsp responedr daemon will listen on ..... $AREX_OCSP_PORT" @@ -740,6 +778,8 @@ sed -i "s:@AREX_FTP_PORT@:$AREX_FTP_PORT:" $AREX_RUN_DIR/httpd.conf sed -i "s:@AREX_FCGI_PORT@:$AREX_FCGI_PORT:" $AREX_RUN_DIR/httpd.conf sed -i "s:@AREX_SCGI_PORT@:$AREX_SCGI_PORT:" $AREX_RUN_DIR/httpd.conf + sed -i "s:@AREX_UWSGI_PORT@:$AREX_UWSGI_PORT:" $AREX_RUN_DIR/httpd.conf + sed -i "s:@AREX_UWSGI_PORT2@:$AREX_UWSGI_PORT2:" $AREX_RUN_DIR/httpd.conf sed -i "s:@AREX_OCSP_PORT@:$AREX_OCSP_PORT:" $AREX_RUN_DIR/httpd.conf sed -i "s:@AREX_SED_COMMAND@:$AREX_SED_COMMAND:" $AREX_RUN_DIR/httpd.conf sed -i "s:@AREX_ROTATELOGS_COMMAND@:$AREX_ROTATELOGS_COMMAND:" $AREX_RUN_DIR/httpd.conf @@ -755,7 +795,9 @@ # source $AREX_RUN_DIR/server_environment, which pre-run.sh # can write - . $AREX_RUN_DIR/server_environment + if [ -e $AREX_RUN_DIR/server_environment ]; then + . $AREX_RUN_DIR/server_environment + fi # create default DocumentRoot mkdir -p $AREX_RUN_DIR/htdocs
