From 8e15e2a400e4368499aa731772b7c1c98ccb975c Mon Sep 17 00:00:00 2001
From: bunkerity <contact@bunkerity.com>
Date: Fri, 12 Aug 2022 16:56:07 +0200
Subject: [PATCH] linux - set /opt/bunkerweb permissions to 755

---
 examples/cors/tests.json | 2 +-
 linux/Dockerfile-centos  | 3 ++-
 linux/Dockerfile-debian  | 3 ++-
 linux/Dockerfile-fedora  | 3 ++-
 linux/Dockerfile-ubuntu  | 3 ++-
 tests/www-deb.conf       | 9 +--------
 tests/www-rpm.conf       | 9 +--------
 7 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/examples/cors/tests.json b/examples/cors/tests.json
index 46df669ba..839d23f9c 100644
--- a/examples/cors/tests.json
+++ b/examples/cors/tests.json
@@ -5,7 +5,7 @@
 		"autoconf",
 		"linux"
 	],
-	"timeout": 6000,
+	"timeout": 60,
 	"tests": [
 		{
 			"type": "string",
diff --git a/linux/Dockerfile-centos b/linux/Dockerfile-centos
index d5796df78..f11adbea4 100644
--- a/linux/Dockerfile-centos
+++ b/linux/Dockerfile-centos
@@ -22,7 +22,8 @@ RUN dnf install -y python39-pip brotli brotli-devel gperftools-devel perl libxsl
     chmod +x /tmp/bunkerweb/deps/install.sh && \
     bash /tmp/bunkerweb/deps/install.sh && \
     mkdir /opt/bunkerweb/deps/python && \
-    pip3.9 install --no-cache-dir --require-hashes --target /opt/bunkerweb/deps/python -r /tmp/bunkerweb/deps/requirements.txt
+    pip3.9 install --no-cache-dir --require-hashes --target /opt/bunkerweb/deps/python -r /tmp/bunkerweb/deps/requirements.txt && \
+	chmod 755 /opt/bunkerweb
 
 # Copy BW files
 # can't exclude deps from . so we are copying everything by hand
diff --git a/linux/Dockerfile-debian b/linux/Dockerfile-debian
index 886b84748..e0fd0f4b8 100644
--- a/linux/Dockerfile-debian
+++ b/linux/Dockerfile-debian
@@ -26,7 +26,8 @@ RUN apt update && \
     chmod +x /tmp/bunkerweb/deps/install.sh && \
     bash /tmp/bunkerweb/deps/install.sh && \
     mkdir /opt/bunkerweb/deps/python && \
-    pip install --no-cache-dir --require-hashes --target /opt/bunkerweb/deps/python -r /tmp/bunkerweb/deps/requirements.txt
+    pip install --no-cache-dir --require-hashes --target /opt/bunkerweb/deps/python -r /tmp/bunkerweb/deps/requirements.txt && \
+	chmod 755 /opt/bunkerweb
 
 # Copy BW files
 # can't exclude deps from . so we are copying everything by hand
diff --git a/linux/Dockerfile-fedora b/linux/Dockerfile-fedora
index 13f286813..627800719 100644
--- a/linux/Dockerfile-fedora
+++ b/linux/Dockerfile-fedora
@@ -21,7 +21,8 @@ RUN dnf install -y python3-pip brotli brotli-devel gperftools-devel perl libxslt
     chmod +x /tmp/bunkerweb/deps/install.sh && \
     bash /tmp/bunkerweb/deps/install.sh && \
     mkdir /opt/bunkerweb/deps/python && \
-    pip install --no-cache-dir --require-hashes --target /opt/bunkerweb/deps/python -r /tmp/bunkerweb/deps/requirements.txt
+    pip install --no-cache-dir --require-hashes --target /opt/bunkerweb/deps/python -r /tmp/bunkerweb/deps/requirements.txt && \
+	chmod 755 /opt/bunkerweb
 
 # Copy BW files
 # can't exclude deps from . so we are copying everything by hand
diff --git a/linux/Dockerfile-ubuntu b/linux/Dockerfile-ubuntu
index 7063fd68a..436a547fd 100644
--- a/linux/Dockerfile-ubuntu
+++ b/linux/Dockerfile-ubuntu
@@ -57,7 +57,8 @@ RUN cp /opt/bunkerweb/helpers/bwcli /usr/local/bin && \
     chmod 770 /opt/bunkerweb/cache /opt/bunkerweb/tmp && \
     chmod 750 /opt/bunkerweb/gen/main.py /opt/bunkerweb/job/main.py /opt/bunkerweb/cli/main.py /opt/bunkerweb/helpers/*.sh /opt/bunkerweb/ui/main.py /opt/bunkerweb/www && \
     find /opt/bunkerweb/core/*/jobs/* -type f -exec chmod 750 {} \; && \
-    pip install --no-cache-dir --target /opt/bunkerweb/deps/python -r /opt/bunkerweb/ui/requirements.txt
+    pip install --no-cache-dir --target /opt/bunkerweb/deps/python -r /opt/bunkerweb/ui/requirements.txt && \
+	chmod 755 /opt/bunkerweb
 
 # Copy Linux files
 COPY linux/variables.env /opt/bunkerweb/variables.env
diff --git a/tests/www-deb.conf b/tests/www-deb.conf
index 2e9d3f9a6..74d9aeeb5 100644
--- a/tests/www-deb.conf
+++ b/tests/www-deb.conf
@@ -1,5 +1,3 @@
-error_log = /tmp/php-fpm.error.log
-log_level = debug
 [www]
 user = www-data
 group = www-data
@@ -11,9 +9,4 @@ pm = dynamic
 pm.max_children = 5
 pm.start_servers = 2
 pm.min_spare_servers = 1
-pm.max_spare_servers = 3
-catch_workers_output = yes
-php_flag[display_errors] = on
-php_admin_value[error_log] = /tmp/php-fpm.log
-php_admin_flag[log_errors] = on
-access.log = /tmp/php-fpm.access.log
\ No newline at end of file
+pm.max_spare_servers = 3
\ No newline at end of file
diff --git a/tests/www-rpm.conf b/tests/www-rpm.conf
index a4161db96..276c8c75c 100644
--- a/tests/www-rpm.conf
+++ b/tests/www-rpm.conf
@@ -1,5 +1,3 @@
-error_log = /tmp/php-fpm.error.log
-log_level = debug
 [www]
 user = apache
 group = apache
@@ -11,9 +9,4 @@ pm = dynamic
 pm.max_children = 5
 pm.start_servers = 2
 pm.min_spare_servers = 1
-pm.max_spare_servers = 3
-catch_workers_output = yes
-php_flag[display_errors] = on
-php_admin_value[error_log] = /tmp/php-fpm.log
-php_admin_flag[log_errors] = on
-access.log = /tmp/php-fpm.access.log
\ No newline at end of file
+pm.max_spare_servers = 3
\ No newline at end of file