Merge pull request #149 from essentialkaos/develop

Version 1.26.0

Author: andyone

.bibop/modules.conf

@@ -6,4 +6,3 @@
 
 load_module modules/ngx_http_brotli_filter_module.so;
 load_module modules/ngx_http_brotli_static_module.so;
-load_module modules/ngx_http_naxsi_module.so;

.bibop/webkaos-docker.recipe

@@ -15,19 +15,7 @@ command "-" "Check if docker is installed"
 
 ## Prefetch images ##
 
-command:fetch "docker pull {image_name}:centos7" "Pull CentOS 7 Image"
-  exit 0
-
-+command:fetch "docker pull {image_name}:centos7-unprivileged" "Pull CentOS 7 Unprivileged Image"
-  exit 0
-
-+command:fetch "docker pull {image_name}:ol7" "Pull OracleLinux 7 Image"
-  exit 0
-
-+command:fetch "docker pull {image_name}:ol7-unprivileged" "Pull OracleLinux 7 Unprivileged Image"
-  exit 0
-
-+command:fetch "docker pull {image_name}:ol8" "Pull OracleLinux 8 Image"
+command:fetch "docker pull {image_name}:ol8" "Pull OracleLinux 8 Image"
   exit 0
 
 +command:fetch "docker pull {image_name}:ol8-unprivileged" "Pull OracleLinux 8 Unprivileged Image"
@@ -41,156 +29,80 @@ command:fetch "docker pull {image_name}:centos7" "Pull CentOS 7 Image"
 
 ## Build images ##
 
-command "docker build --build-arg {repo_tag} -f ../.docker/centos7.docker -t {image_name}:centos7 .." "Build CentOS 7 Image"
-  exit 0 {build_timeout}
-
-+command "docker build --build-arg {repo_tag} -f ../.docker/centos7-unprivileged.docker -t {image_name}:centos7-unprivileged .." "Build CentOS 7 Unprivileged Image"
-  exit 0 {build_timeout}
-
-+command "docker build --build-arg {repo_tag} -f ../.docker/ol7.docker -t {image_name}:ol7 .." "Build OracleLinux 7 Image"
-  exit 0 {build_timeout}
-
-+command "docker build --build-arg {repo_tag} -f ../.docker/ol7-unprivileged.docker -t {image_name}:ol7-unprivileged .." "Build OracleLinux 7 Unprivileged Image"
-  exit 0 {build_timeout}
-
-+command "docker build --build-arg {repo_tag} -f ../.docker/ol8.docker -t {image_name}:ol8 .." "Build OracleLinux 8 Image"
+command:build "docker build --build-arg {repo_tag} -f ../.docker/ol8.docker -t {image_name}:ol8 .." "Build OracleLinux 8 Image"
   exit 0 {build_timeout}
 
-+command "docker build --build-arg {repo_tag} -f ../.docker/ol8-unprivileged.docker -t {image_name}:ol8-unprivileged .." "Build OracleLinux 8 Unprivileged Image"
++command:build "docker build --build-arg {repo_tag} -f ../.docker/ol8-unprivileged.docker -t {image_name}:ol8-unprivileged .." "Build OracleLinux 8 Unprivileged Image"
   exit 0 {build_timeout}
 
-+command "docker build --build-arg {repo_tag} -f ../.docker/ol9.docker -t {image_name}:ol9 .." "Build OracleLinux 9 Image"
++command:build "docker build --build-arg {repo_tag} -f ../.docker/ol9.docker -t {image_name}:ol9 .." "Build OracleLinux 9 Image"
   exit 0 {build_timeout}
 
-+command "docker build --build-arg {repo_tag} -f ../.docker/ol9-unprivileged.docker -t {image_name}:ol9-unprivileged .." "Build OracleLinux 9 Unprivileged Image"
++command:build "docker build --build-arg {repo_tag} -f ../.docker/ol9-unprivileged.docker -t {image_name}:ol9-unprivileged .." "Build OracleLinux 9 Unprivileged Image"
   exit 0 {build_timeout}
 
-## CentOS 7 ##
-
-command "docker run --name webkaos -p {test_port}:80 -d {image_name}:centos7" "Start container"
-  exit 0
-
-+command "-" "Check if server is accessible"
-  wait {start_delay}
-  http-status GET "http://0.0.0.0:{test_port}" 200
-  http-header GET "http://0.0.0.0:{test_port}" server webkaos
-
-+command "docker kill webkaos" "Kill container after test"
-  exit 0
-
-+command "docker rm webkaos" "Remove named container after test"
-  exit 0
-
-## CentOS 7 Unprivileged ##
-
-command "docker run --name webkaos -p {test_port}:8080 -d {image_name}:centos7-unprivileged" "Start container"
-  exit 0
-
-+command "-" "Check if server is accessible"
-  wait {start_delay}
-  http-status GET "http://0.0.0.0:{test_port}" 200
-  http-header GET "http://0.0.0.0:{test_port}" server webkaos
-
-+command "docker kill webkaos" "Kill container after test"
-  exit 0
-
-+command "docker rm webkaos" "Remove named container after test"
-  exit 0
-
-## Oracle Linux 7 ##
-
-command "docker run --name webkaos -p {test_port}:80 -d {image_name}:ol7" "Start container"
-  exit 0
-
-+command "-" "Check if server is accessible"
-  wait {start_delay}
-  http-status GET "http://0.0.0.0:{test_port}" 200
-  http-header GET "http://0.0.0.0:{test_port}" server webkaos
-
-+command "docker kill webkaos" "Kill container after test"
-  exit 0
-
-+command "docker rm webkaos" "Remove named container after test"
-  exit 0
-
-## Oracle Linux 7 Unprivileged ##
-
-command "docker run --name webkaos -p {test_port}:8080 -d {image_name}:ol7-unprivileged" "Start container"
-  exit 0
-
-+command "-" "Check if server is accessible"
-  wait {start_delay}
-  http-status GET "http://0.0.0.0:{test_port}" 200
-  http-header GET "http://0.0.0.0:{test_port}" server webkaos
-
-+command "docker kill webkaos" "Kill container after test"
-  exit 0
-
-+command "docker rm webkaos" "Remove named container after test"
-  exit 0
-
 ## Oracle Linux 8 ##
 
-command "docker run --name webkaos -p {test_port}:80 -d {image_name}:ol8" "Start container"
+command "docker run --name webkaos -p {test_port}:80 -d {image_name}:ol8" "(OracleLinux 8) Start container"
   exit 0
 
-+command "-" "Check if server is accessible"
++command "-" "(OracleLinux 8) Check if server is accessible"
   wait {start_delay}
   http-status GET "http://0.0.0.0:{test_port}" 200
   http-header GET "http://0.0.0.0:{test_port}" server webkaos
 
-+command "docker kill webkaos" "Kill container after test"
++command "docker kill webkaos" "(OracleLinux 8) Kill container after test"
   exit 0
 
-+command "docker rm webkaos" "Remove named container after test"
++command "docker rm webkaos" "(OracleLinux 8) Remove named container after test"
   exit 0
 
 ## Oracle Linux 8 Unprivileged ##
 
-command "docker run --name webkaos -p {test_port}:8080 -d {image_name}:ol8-unprivileged" "Start container"
+command "docker run --name webkaos -p {test_port}:8080 -d {image_name}:ol8-unprivileged" "(OracleLinux 8 Unprivileged) Start container"
   exit 0
 
-+command "-" "Check if server is accessible"
++command "-" "(OracleLinux 8 Unprivileged) Check if server is accessible"
   wait {start_delay}
   http-status GET "http://0.0.0.0:{test_port}" 200
   http-header GET "http://0.0.0.0:{test_port}" server webkaos
 
-+command "docker kill webkaos" "Kill container after test"
++command "docker kill webkaos" "(OracleLinux 8 Unprivileged) Kill container after test"
   exit 0
 
-+command "docker rm webkaos" "Remove named container after test"
++command "docker rm webkaos" "(OracleLinux 8 Unprivileged) Remove named container after test"
   exit 0
 
 ## Oracle Linux 9 ##
 
-command "docker run --name webkaos -p {test_port}:80 -d {image_name}:ol9" "Start container"
+command "docker run --name webkaos -p {test_port}:80 -d {image_name}:ol9" "(OracleLinux 9) Start container"
   exit 0
 
-+command "-" "Check if server is accessible"
++command "-" "(OracleLinux 9) Check if server is accessible"
   wait {start_delay}
   http-status GET "http://0.0.0.0:{test_port}" 200
   http-header GET "http://0.0.0.0:{test_port}" server webkaos
 
-+command "docker kill webkaos" "Kill container after test"
++command "docker kill webkaos" "(OracleLinux 9) Kill container after test"
   exit 0
 
-+command "docker rm webkaos" "Remove named container after test"
++command "docker rm webkaos" "(OracleLinux 9) Remove named container after test"
   exit 0
 
 ## Oracle Linux 9 Unprivileged ##
 
-command "docker run --name webkaos -p {test_port}:8080 -d {image_name}:ol9-unprivileged" "Start container"
+command "docker run --name webkaos -p {test_port}:8080 -d {image_name}:ol9-unprivileged" "(OracleLinux 9 Unprivileged) Start container"
   exit 0
 
-+command "-" "Check if server is accessible"
++command "-" "(OracleLinux 9 Unprivileged) Check if server is accessible"
   wait {start_delay}
   http-status GET "http://0.0.0.0:{test_port}" 200
   http-header GET "http://0.0.0.0:{test_port}" server webkaos
 
-+command "docker kill webkaos" "Kill container after test"
++command "docker kill webkaos" "(OracleLinux 9 Unprivileged) Kill container after test"
   exit 0
 
-+command "docker rm webkaos" "Remove named container after test"
++command "docker rm webkaos" "(OracleLinux 9 Unprivileged) Remove named container after test"
   exit 0
 
 ## Extra commands ##

.bibop/webkaos.conf

@@ -95,9 +95,12 @@ http {
   }
 
   server {
-    listen         443 ssl http2;
+    listen         443 ssl;
+    http2          on;
     server_name    _;
 
+    ssl_dyn_rec_enable on;
+
     ssl_certificate /etc/webkaos/ssl/ssl.crt;
     ssl_certificate_key /etc/webkaos/ssl/ssl.key;
 

.bibop/webkaos.recipe

@@ -1,7 +1,7 @@
-# Bibop recipe for webkaos (EL7/EL8/EL9)
+# Bibop recipe for webkaos (EL8/EL9)
 # See more: https://kaos.sh/bibop
 
-pkg webkaos webkaos-debug webkaos-nginx webkaos-module-brotli webkaos-module-naxsi
+pkg webkaos webkaos-debug webkaos-nginx webkaos-module-brotli
 
 require-root yes
 unsafe-actions yes
@@ -20,7 +20,7 @@ var ssl_dir {prefix_dir}/ssl
 var dh_param {ssl_dir}/dhparam.pem
 var log_dir /var/log/webkaos
 
-var lua_ver 2.1.0-beta3
+var lua_ver 2.1
 var lua_dir /usr/share/webkaos/luajit/share/luajit-{lua_ver}
 
 command "-" "System environment validation"
@@ -187,12 +187,6 @@ command "-" "Check brotli module"
   mode {modules_dir}/ngx_http_brotli_filter_module.so 755
   mode {modules_dir}/ngx_http_brotli_static_module.so 755
 
-command "-" "Check NAXSI module"
-  exist {prefix_dir}/naxsi_core.rules
-  exist {modules_dir}/ngx_http_naxsi_module.so
-  mode {prefix_dir}/naxsi_core.rules 644
-  mode {modules_dir}/ngx_http_naxsi_module.so 755
-
 command "systemctl start {service_name}" "Start service"
   wait-pid {pid_file} 5
   service-works {service_name}