diff --git a/.travis.yml b/.travis.yml index 9564fec979..4e1482d2fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,8 +69,8 @@ before_script: script: - php doc/rpm-build/post_install.php - --source_dir `pwd` --start_db '' --autostart_db '' || true - - mysql -uroot -e 'show tables' egroupware || true + --source_dir `pwd` --start_db '' --autostart_db '' --start_webserver '' --webserver_user '' + - mysql -uroot -e 'show tables' egroupware # Ubuntu has problems with #!/usr/bin/env php -dapc.enable=1, it stalls forever - php -dapc.enable_cli=1 doc/test-cli.php - ./doc/php_syntax_check.sh diff --git a/doc/rpm-build/post_install.php b/doc/rpm-build/post_install.php index bc3ab665d9..bea2835f76 100755 --- a/doc/rpm-build/post_install.php +++ b/doc/rpm-build/post_install.php @@ -423,10 +423,12 @@ else // fix egw_cache evtl. created by root, stoping webserver from accessing it fix_perms(); - // restart running Apache, to force APC to update changed sources and/or Apache configuration - $output = array(); - run_cmd(build_cmd('start_webserver', 'status').' && '.build_cmd('start_webserver', 'restart'), $output, true); - + if (!empty($config['start_webserver'])) + { + // restart running Apache, to force APC to update changed sources and/or Apache configuration + $output = array(); + run_cmd(build_cmd('start_webserver', 'status').' && '.build_cmd('start_webserver', 'restart'), $output, true); + } exit($ret); } @@ -577,7 +579,7 @@ function fix_perms() { global $config; - if (file_exists('/tmp/egw_cache')) + if (file_exists('/tmp/egw_cache') && !empty($config['webserver_user'])) { system('/bin/chown -R '.$config['webserver_user'].' /tmp/egw_cache'); system('/bin/chmod 700 /tmp/egw_cache');