From: gggeek <giunta.gaetano@gmail.com>
Date: Sun, 13 Dec 2020 16:08:42 +0000 (+0000)
Subject: wip travis
X-Git-Tag: 4.4.3~27
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=529f74d1b69fd82d075e5240c6d8daca0b1a718d;p=plcapi.git

wip travis
---

diff --git a/tests/ci/setup/create_user.sh b/tests/ci/setup/create_user.sh
old mode 100644
new mode 100755
diff --git a/tests/ci/setup/install_packages.sh b/tests/ci/setup/install_packages.sh
old mode 100644
new mode 100755
index c760675e..97758186
--- a/tests/ci/setup/install_packages.sh
+++ b/tests/ci/setup/install_packages.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# Has to be run as admin
+
 set -e
 
 DEBIAN_FRONTEND=noninteractive apt-get install -y \
diff --git a/tests/ci/setup/setup_apache.sh b/tests/ci/setup/setup_apache.sh
old mode 100644
new mode 100755
index 781f203a..193d3994
--- a/tests/ci/setup/setup_apache.sh
+++ b/tests/ci/setup/setup_apache.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 
-set -e
-
+# Install and configure apache2
+# Has to be run as admin
 # @todo make this work across all apache versions (precise to focal)
 
-SCRIPT_DIR="$(dirname -- "$(readlink -f "$0")")"
+set -e
 
-# install and configure apache2
+SCRIPT_DIR="$(dirname -- "$(readlink -f "$0")")"
 
 DEBIAN_FRONTEND=noninteractive apt-get install -y apache2
 
diff --git a/tests/ci/setup/setup_composer.sh b/tests/ci/setup/setup_composer.sh
old mode 100644
new mode 100755
diff --git a/tests/ci/setup/setup_php.sh b/tests/ci/setup/setup_php.sh
old mode 100644
new mode 100755
index ad94b814..e45765cc
--- a/tests/ci/setup/setup_php.sh
+++ b/tests/ci/setup/setup_php.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# Has to be run as admin
+
 # To be kept in sync with setup_php_travis.sh
 
 set -e
diff --git a/tests/ci/setup/setup_php_travis.sh b/tests/ci/setup/setup_php_travis.sh
old mode 100644
new mode 100755
index fd37f141..63ddcad3
--- a/tests/ci/setup/setup_php_travis.sh
+++ b/tests/ci/setup/setup_php_travis.sh
@@ -39,8 +39,9 @@ if [ -d ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d ]; then
     fi
 fi
 
+# @todo run php-fpm as root, and set up 'travis' as user in www.conf, instead ?
 ~/.phpenv/versions/${PHPVER}/sbin/php-fpm
 
 # @todo configure apache for php-fpm via mod_proxy_fcgi...
-sudo a2enconf php${PHPVER}-fpm
-sudo service apache2 restart
+#sudo a2enconf php${PHPVER}-fpm
+#sudo service apache2 restart
diff --git a/tests/ci/setup/setup_privoxy.sh b/tests/ci/setup/setup_privoxy.sh
old mode 100644
new mode 100755
index a0477ddf..c39e62f0
--- a/tests/ci/setup/setup_privoxy.sh
+++ b/tests/ci/setup/setup_privoxy.sh
@@ -1,8 +1,9 @@
 #!/bin/sh
 
-set -e
+# Install and configure privoxy
+# Has to be run as admin
 
-# install and configure privoxy
+set -e
 
 SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"