Merge pull request #521 from linuxserver/tidy-init

linuxserver · Nov 16, 2024 · 4437f6f · 4437f6f
2 parents ca3830d + ed7c58a
commit 4437f6f
Show file tree

Hide file tree

Showing 34 changed files with 21 additions and 28 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -10,8 +10,10 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="nemchik"
 
 # environment settings
-ENV DHLEVEL=2048 ONLY_SUBDOMAINS=false AWS_CONFIG_FILE=/config/dns-conf/route53.ini
-ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
+ENV DHLEVEL=2048 \
+  ONLY_SUBDOMAINS=false \
+  AWS_CONFIG_FILE=/config/dns-conf/route53.ini \
+  S6_BEHAVIOUR_IF_STAGE2_FAILS=2
 
 RUN \
   echo "**** install build packages ****" && \

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -10,8 +10,10 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="nemchik"
 
 # environment settings
-ENV DHLEVEL=2048 ONLY_SUBDOMAINS=false AWS_CONFIG_FILE=/config/dns-conf/route53.ini
-ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
+ENV DHLEVEL=2048 \
+  ONLY_SUBDOMAINS=false \
+  AWS_CONFIG_FILE=/config/dns-conf/route53.ini \
+  S6_BEHAVIOUR_IF_STAGE2_FAILS=2
 
 RUN \
   echo "**** install build packages ****" && \

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -29,12 +29,12 @@ pipeline {
     PR_DOCKERHUB_IMAGE = 'lspipepr/swag'
     DIST_IMAGE = 'alpine'
     MULTIARCH='true'
-    CI='true'
+    CI='false'
     CI_WEB='false'
     CI_PORT='80'
     CI_SSL='false'
     CI_DELAY='30'
-    CI_DOCKERENV='TEST_RUN=1'
+    CI_DOCKERENV=''
     CI_AUTH=''
     CI_WEBPATH=''
   }

diff --git a/README.md b/README.md
@@ -37,7 +37,6 @@ Find us at:
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/swag.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/swag)
 [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/swag.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/swag)
 [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-swag%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-swag/job/master/)
-[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fswag%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/swag/latest/index.html)
 
 SWAG - Secure Web Application Gateway (formerly known as letsencrypt, no relation to Let's Encrypt™) sets up an Nginx webserver and reverse proxy with php support and a built-in certbot client that automates free SSL server certificate generation and renewal processes (Let's Encrypt and ZeroSSL). It also contains fail2ban for intrusion prevention.
 

diff --git a/jenkins-vars.yml b/jenkins-vars.yml
@@ -17,12 +17,12 @@ repo_vars:
   - PR_DOCKERHUB_IMAGE = 'lspipepr/swag'
   - DIST_IMAGE = 'alpine'
   - MULTIARCH='true'
-  - CI='true'
+  - CI='false'
   - CI_WEB='false'
   - CI_PORT='80'
   - CI_SSL='false'
   - CI_DELAY='30'
-  - CI_DOCKERENV='TEST_RUN=1'
+  - CI_DOCKERENV=''
   - CI_AUTH=''
   - CI_WEBPATH=''
 sponsor_links:

diff --git a/root/app/le-renew.sh b/root/app/le-renew.sh
diff --git a/...t-config/dependencies.d/init-nginx-config → ...ot-config/dependencies.d/init-swag-config b/...t-config/dependencies.d/init-nginx-config → ...ot-config/dependencies.d/init-swag-config
diff --git a/...config/dependencies.d/init-samples-config → ...n-config/dependencies.d/init-swag-samples b/...config/dependencies.d/init-samples-config → ...n-config/dependencies.d/init-swag-samples
diff --git a/root/etc/s6-overlay/s6-rc.d/init-fail2ban-config/run b/root/etc/s6-overlay/s6-rc.d/init-fail2ban-config/run
@@ -2,12 +2,12 @@
 # shellcheck shell=bash
 
 if ! iptables -L &> /dev/null; then
-  ln -sf /sbin/xtables-legacy-multi /sbin/iptables
-  ln -sf /sbin/xtables-legacy-multi /sbin/iptables-save
-  ln -sf /sbin/xtables-legacy-multi /sbin/iptables-restore
-  ln -sf /sbin/xtables-legacy-multi /sbin/ip6tables
-  ln -sf /sbin/xtables-legacy-multi /sbin/ip6tables-save
-  ln -sf /sbin/xtables-legacy-multi /sbin/ip6tables-restore
+    ln -sf /sbin/xtables-legacy-multi /sbin/iptables
+    ln -sf /sbin/xtables-legacy-multi /sbin/iptables-save
+    ln -sf /sbin/xtables-legacy-multi /sbin/iptables-restore
+    ln -sf /sbin/xtables-legacy-multi /sbin/ip6tables
+    ln -sf /sbin/xtables-legacy-multi /sbin/ip6tables-save
+    ln -sf /sbin/xtables-legacy-multi /sbin/ip6tables-restore
 fi
 
 # copy/update the fail2ban config defaults to/in /config

diff --git a/root/etc/s6-overlay/s6-rc.d/init-folders-config/up b/root/etc/s6-overlay/s6-rc.d/init-folders-config/up
diff --git a/root/etc/s6-overlay/s6-rc.d/init-nginx-config/up b/root/etc/s6-overlay/s6-rc.d/init-nginx-config/up
diff --git a/root/etc/s6-overlay/s6-rc.d/init-permissions-config/run b/root/etc/s6-overlay/s6-rc.d/init-permissions-config/run
@@ -6,4 +6,3 @@ lsiown -R abc:abc \
     /config
 chmod -R 0644 /etc/logrotate.d
 chmod -R +r /config/log
-chmod +x /app/le-renew.sh
diff --git a/...rs-config/dependencies.d/init-require-url → ...it-require-url/dependencies.d/init-config b/...rs-config/dependencies.d/init-require-url → ...it-require-url/dependencies.d/init-config
diff --git a/root/etc/s6-overlay/s6-rc.d/init-samples-config/up b/root/etc/s6-overlay/s6-rc.d/init-samples-config/up
diff --git a/...onfig/dependencies.d/init-fail2ban-config → ...onfig/dependencies.d/init-fail2ban-config b/...onfig/dependencies.d/init-fail2ban-config → ...onfig/dependencies.d/init-fail2ban-config
diff --git a/.../s6-overlay/s6-rc.d/init-nginx-config/run → ...c/s6-overlay/s6-rc.d/init-swag-config/run b/.../s6-overlay/s6-rc.d/init-nginx-config/run → ...c/s6-overlay/s6-rc.d/init-swag-config/run
diff --git a/...-overlay/s6-rc.d/init-folders-config/type → .../s6-overlay/s6-rc.d/init-swag-config/type b/...-overlay/s6-rc.d/init-folders-config/type → .../s6-overlay/s6-rc.d/init-swag-config/type
diff --git a/root/etc/s6-overlay/s6-rc.d/init-swag-config/up b/root/etc/s6-overlay/s6-rc.d/init-swag-config/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-swag-config/run
diff --git a/...-require-url/dependencies.d/init-test-run → ...g-folders/dependencies.d/init-require-url b/...-require-url/dependencies.d/init-test-run → ...g-folders/dependencies.d/init-require-url
diff --git a/...6-overlay/s6-rc.d/init-folders-config/run → .../s6-overlay/s6-rc.d/init-swag-folders/run b/...6-overlay/s6-rc.d/init-folders-config/run → .../s6-overlay/s6-rc.d/init-swag-folders/run
diff --git a/...s6-overlay/s6-rc.d/init-nginx-config/type → ...s6-overlay/s6-rc.d/init-swag-folders/type b/...s6-overlay/s6-rc.d/init-nginx-config/type → ...s6-overlay/s6-rc.d/init-swag-folders/type
diff --git a/root/etc/s6-overlay/s6-rc.d/init-swag-folders/up b/root/etc/s6-overlay/s6-rc.d/init-swag-folders/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-swag-folders/run
diff --git a/...config/dependencies.d/init-folders-config → ...-samples/dependencies.d/init-swag-folders b/...config/dependencies.d/init-folders-config → ...-samples/dependencies.d/init-swag-folders
diff --git a/...6-overlay/s6-rc.d/init-samples-config/run → .../s6-overlay/s6-rc.d/init-swag-samples/run b/...6-overlay/s6-rc.d/init-samples-config/run → .../s6-overlay/s6-rc.d/init-swag-samples/run
diff --git a/...-overlay/s6-rc.d/init-samples-config/type → ...s6-overlay/s6-rc.d/init-swag-samples/type b/...-overlay/s6-rc.d/init-samples-config/type → ...s6-overlay/s6-rc.d/init-swag-samples/type
diff --git a/root/etc/s6-overlay/s6-rc.d/init-swag-samples/up b/root/etc/s6-overlay/s6-rc.d/init-swag-samples/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-swag-samples/run
diff --git a/root/etc/s6-overlay/s6-rc.d/init-test-run/run b/root/etc/s6-overlay/s6-rc.d/init-test-run/run
diff --git a/root/etc/s6-overlay/s6-rc.d/init-test-run/type b/root/etc/s6-overlay/s6-rc.d/init-test-run/type
diff --git a/root/etc/s6-overlay/s6-rc.d/init-test-run/up b/root/etc/s6-overlay/s6-rc.d/init-test-run/up
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-samples-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-samples-config
diff --git a/...it-test-run/dependencies.d/init-nginx-end → .../s6-rc.d/user/contents.d/init-swag-config b/...it-test-run/dependencies.d/init-nginx-end → .../s6-rc.d/user/contents.d/init-swag-config
diff --git a/...-rc.d/user/contents.d/init-folders-config → ...s6-rc.d/user/contents.d/init-swag-folders b/...-rc.d/user/contents.d/init-folders-config → ...s6-rc.d/user/contents.d/init-swag-folders
diff --git a/...s6-rc.d/user/contents.d/init-nginx-config → ...s6-rc.d/user/contents.d/init-swag-samples b/...s6-rc.d/user/contents.d/init-nginx-config → ...s6-rc.d/user/contents.d/init-swag-samples
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-test-run b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-test-run