fix duplicate datastore http/stream, fix missing /var/www/html for linux and various fixes in tests

src/bw/lua/datastore.lua

@@ -1,5 +1,10 @@
+
 local datastore = { dict = ngx.shared.datastore }
 
+if not datastore.dict then
+	datastore.dict = ngx.shared.datastore_stream
+end
+
 datastore.get = function(self, key)
 	local value, err = self.dict:get(key)
 	if not value and not err then

src/common/confs/stream.conf

@@ -27,7 +27,9 @@ lua_package_path "/usr/share/bunkerweb/lua/?.lua;/usr/share/bunkerweb/core/?.lua
 lua_package_cpath "/usr/share/bunkerweb/deps/lib/?.so;/usr/share/bunkerweb/deps/lib/lua/?.so;;";
 lua_ssl_trusted_certificate "/usr/share/bunkerweb/misc/root-ca.pem";
 lua_ssl_verify_depth 2;
-lua_shared_dict datastore {{ DATASTORE_MEMORY_SIZE }};
+{% if has_variable(all, "SERVER_TYPE", "stream") +%}
+lua_shared_dict datastore_stream {{ DATASTORE_MEMORY_SIZE }};
+{% endif %}
 
 # LUA init block
 include /etc/nginx/init-stream-lua.conf;

src/linux/Dockerfile-centos

@@ -62,7 +62,7 @@ RUN cp /usr/share/bunkerweb/helpers/bwcli /usr/bin/ && \
     mkdir -p /var/cache/bunkerweb/ && \
     mkdir -p /etc/bunkerweb/plugins && \
     mkdir -p /var/tmp/bunkerweb/ && \
-    mkdir -p /var/www && \
+    mkdir -p /var/www/html && \
     mkdir -p /var/lib/bunkerweb && \
     mkdir -p /etc/letsencrypt && \
     #mkdir /var/www/html && \

src/linux/Dockerfile-fedora

@@ -61,7 +61,7 @@ RUN cp /usr/share/bunkerweb/helpers/bwcli /usr/bin/ && \
     mkdir -p /var/cache/bunkerweb/ && \
     mkdir -p /etc/bunkerweb/plugins && \
     mkdir -p /var/tmp/bunkerweb/ && \
-    mkdir -p /var/www/ && \
+    mkdir -p /var/www/html && \
     mkdir -p /var/lib/bunkerweb && \
     mkdir -p /etc/letsencrypt && \
     echo "Linux" > /usr/share/bunkerweb/INTEGRATION && \

src/linux/Dockerfile-rhel

@@ -74,7 +74,7 @@ RUN cp /usr/share/bunkerweb/helpers/bwcli /usr/bin/ && \
     mkdir -p /var/cache/bunkerweb/ && \
     mkdir -p /etc/bunkerweb/plugins && \
     mkdir -p /var/tmp/bunkerweb/ && \
-    mkdir -p /var/www/ && \
+    mkdir -p /var/www/html && \
     mkdir -p /var/lib/bunkerweb && \
     mkdir -p /etc/letsencrypt && \
     echo "Linux" > /usr/share/bunkerweb/INTEGRATION && \
@@ -96,4 +96,4 @@ COPY src/linux/bunkerweb-ui.service /lib/systemd/system/bunkerweb-ui.service
 # Generate RPM at startup
 VOLUME /data
 WORKDIR /usr/share/
-ENTRYPOINT ["/usr/share/fpm.sh", "rpm"]
+ENTRYPOINT ["/usr/share/fpm.sh", "rpm"]

src/linux/Dockerfile-ubuntu

@@ -64,7 +64,7 @@ RUN cp /usr/share/bunkerweb/helpers/bwcli /usr/bin/ && \
     mkdir -p /var/cache/bunkerweb/ && \
     mkdir -p /etc/bunkerweb/plugins && \
     mkdir -p /var/tmp/bunkerweb/ && \
-    mkdir -p /var/www/ && \
+    mkdir -p /var/www/html && \
     mkdir -p /var/lib/bunkerweb && \
     mkdir -p /etc/letsencrypt && \
     echo "Linux" > /usr/share/bunkerweb/INTEGRATION && \

tests/LinuxTest.py

@@ -32,7 +32,7 @@ class LinuxTest(Test):
                 raise Exception("docker run failed (linux stack)")
             if distro in ("ubuntu", "debian"):
                 cmd = "apt install -y /opt/\$(ls /opt | grep deb)"
-            elif distro in ("centos", "fedora"):
+            elif distro in ("centos", "fedora", "rhel"):
                 cmd = "dnf install -y /opt/\$(ls /opt | grep rpm)"
             proc = LinuxTest.docker_exec(distro, cmd)
             if proc.returncode != 0:
@@ -117,7 +117,7 @@ class LinuxTest(Test):
                 raise Exception("docker exec cp variables.env failed (test)")
             proc = self.docker_exec(
                 self.__distro,
-                "echo '' >> /opt/bunkerweb/variables.env ; echo 'USE_LETS_ENCRYPT_STAGING=yes' >> /opt/bunkerweb/variables.env",
+                "echo '' >> /etc/bunkerweb/variables.env ; echo 'USE_LETS_ENCRYPT_STAGING=yes' >> /etc/bunkerweb/variables.env",
             )
             if proc.returncode != 0:
                 raise (Exception("docker exec append variables.env failed (test)"))

tests/SwarmTest.py

@@ -71,7 +71,7 @@ class SwarmTest(Test):
                 i += 1
             if not healthy:
                 proc = run(
-                    "docker service logs bunkerweb_mybunker ; docker service logs bunkerweb_myautoconf",
+                    "docker service logs bunkerweb_bunkerweb ; docker service logs bunkerweb_bw-autoconf ; docker service logs bunkerweb_bw-scheduler",
                     cwd="/tmp/swarm",
                     shell=True,
                     capture_output=True,
@@ -188,8 +188,9 @@ class SwarmTest(Test):
         return True
 
     def _debug_fail(self):
-        run("docker service logs bunkerweb_mybunker", shell=True)
-        run("docker service logs bunkerweb_myautoconf", shell=True)
+        run("docker service logs bunkerweb_bunkerweb", shell=True)
+        run("docker service logs bunkerweb_bw-autoconf", shell=True)
+        run("docker service logs bunkerweb_bw-scheduler", shell=True)
         proc = run(
             'docker stack services --format "{{ .Name }}" "' + self._name + '"',
             shell=True,

tests/linux/Dockerfile-ubuntu

@@ -31,8 +31,8 @@ RUN apt update && \
     apt-get update && \
     apt-get install -y --no-install-recommends nginx=${NGINX_VERSION}-1~jammy
 
-COPY ./package-ubuntu/*.deb /opt
+#COPY ./package-ubuntu/*.deb /opt
 
 VOLUME ["/sys/fs/cgroup"]
 
-CMD ["/lib/systemd/systemd"]
+CMD ["/lib/systemd/systemd"]