diff --git a/Dockerfile b/Dockerfile index ab09327..fc57d87 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,6 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.15 +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.17 # set version label ARG BUILD_DATE @@ -14,9 +16,8 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ + build-base \ cargo \ - g++ \ - gcc \ libffi-dev \ libxml2-dev \ libxslt-dev \ @@ -24,11 +25,9 @@ RUN \ python3-dev && \ echo "**** install runtime packages ****" && \ apk add --no-cache --upgrade \ - curl \ fail2ban \ gnupg \ memcached \ - nginx \ nginx-mod-http-brotli \ nginx-mod-http-dav-ext \ nginx-mod-http-echo \ @@ -46,62 +45,58 @@ RUN \ nginx-mod-stream \ nginx-mod-stream-geoip2 \ nginx-vim \ - php8-bcmath \ - php8-bz2 \ - php8-ctype \ - php8-curl \ - php8-dom \ - php8-exif \ - php8-ftp \ - php8-gd \ - php8-gmp \ - php8-iconv \ - php8-imap \ - php8-intl \ - php8-ldap \ - php8-mysqli \ - php8-mysqlnd \ - php8-opcache \ - php8-pdo_mysql \ - php8-pdo_odbc \ - php8-pdo_pgsql \ - php8-pdo_sqlite \ - php8-pear \ - php8-pecl-apcu \ - php8-pecl-mailparse \ - php8-pecl-mcrypt \ - php8-pecl-memcached \ - php8-pecl-redis \ - php8-pgsql \ - php8-phar \ - php8-posix \ - php8-soap \ - php8-sockets \ - php8-sodium \ - php8-sqlite3 \ - php8-tokenizer \ - php8-xml \ - php8-xmlreader \ - php8-xsl \ - php8-zip \ - py3-cryptography \ - py3-future \ - py3-pip \ + php81-bcmath \ + php81-bz2 \ + php81-ctype \ + php81-curl \ + php81-dom \ + php81-exif \ + php81-ftp \ + php81-gd \ + php81-gmp \ + php81-iconv \ + php81-imap \ + php81-intl \ + php81-ldap \ + php81-mysqli \ + php81-mysqlnd \ + php81-opcache \ + php81-pdo_mysql \ + php81-pdo_odbc \ + php81-pdo_pgsql \ + php81-pdo_sqlite \ + php81-pear \ + php81-pecl-apcu \ + php81-pecl-mailparse \ + php81-pecl-mcrypt \ + php81-pecl-memcached \ + php81-pecl-redis \ + php81-pgsql \ + php81-phar \ + php81-posix \ + php81-soap \ + php81-sockets \ + php81-sodium \ + php81-sqlite3 \ + php81-tokenizer \ + php81-xmlreader \ + php81-xsl \ + php81-zip \ whois && \ apk add --no-cache \ --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \ - php8-pecl-xmlrpc && \ + php81-pecl-xmlrpc && \ echo "**** install certbot plugins ****" && \ if [ -z ${CERTBOT_VERSION+x} ]; then \ - CERTBOT="certbot"; \ - else \ - CERTBOT="certbot==${CERTBOT_VERSION}"; \ + CERTBOT_VERSION=$(curl -sL https://pypi.python.org/pypi/certbot/json |jq -r '. | .info.version'); \ fi && \ - pip3 install -U \ - pip wheel && \ - pip install -U --find-links https://wheel-index.linuxserver.io/alpine-3.15/ \ + python3 -m ensurepip && \ + pip3 install -U --no-cache-dir \ + pip \ + wheel && \ + pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \ acme==${CERTBOT_VERSION} \ - ${CERTBOT} \ + certbot==${CERTBOT_VERSION} \ certbot-dns-acmedns \ certbot-dns-aliyun \ certbot-dns-azure \ @@ -141,6 +136,7 @@ RUN \ certbot-dns-vultr \ certbot-plugin-gandi \ cryptography \ + future \ requests && \ echo "**** enable OCSP stapling from base ****" && \ sed -i \ @@ -176,14 +172,10 @@ RUN \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ - for cleanfiles in *.pyc *.pyo; \ - do \ - find /usr/lib/python3.* -iname "${cleanfiles}" -exec rm -f '{}' + \ - ; done && \ rm -rf \ /tmp/* \ - /root/.cache \ - /root/.cargo + $HOME/.cache \ + $HOME/.cargo # copy local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 3694742..208090e 100755 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,6 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.15 +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.17 # set version label ARG BUILD_DATE @@ -14,9 +16,8 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ + build-base \ cargo \ - g++ \ - gcc \ libffi-dev \ libxml2-dev \ libxslt-dev \ @@ -24,11 +25,9 @@ RUN \ python3-dev && \ echo "**** install runtime packages ****" && \ apk add --no-cache --upgrade \ - curl \ fail2ban \ gnupg \ memcached \ - nginx \ nginx-mod-http-brotli \ nginx-mod-http-dav-ext \ nginx-mod-http-echo \ @@ -46,62 +45,58 @@ RUN \ nginx-mod-stream \ nginx-mod-stream-geoip2 \ nginx-vim \ - php8-bcmath \ - php8-bz2 \ - php8-ctype \ - php8-curl \ - php8-dom \ - php8-exif \ - php8-ftp \ - php8-gd \ - php8-gmp \ - php8-iconv \ - php8-imap \ - php8-intl \ - php8-ldap \ - php8-mysqli \ - php8-mysqlnd \ - php8-opcache \ - php8-pdo_mysql \ - php8-pdo_odbc \ - php8-pdo_pgsql \ - php8-pdo_sqlite \ - php8-pear \ - php8-pecl-apcu \ - php8-pecl-mailparse \ - php8-pecl-mcrypt \ - php8-pecl-memcached \ - php8-pecl-redis \ - php8-pgsql \ - php8-phar \ - php8-posix \ - php8-soap \ - php8-sockets \ - php8-sodium \ - php8-sqlite3 \ - php8-tokenizer \ - php8-xml \ - php8-xmlreader \ - php8-xsl \ - php8-zip \ - py3-cryptography \ - py3-future \ - py3-pip \ + php81-bcmath \ + php81-bz2 \ + php81-ctype \ + php81-curl \ + php81-dom \ + php81-exif \ + php81-ftp \ + php81-gd \ + php81-gmp \ + php81-iconv \ + php81-imap \ + php81-intl \ + php81-ldap \ + php81-mysqli \ + php81-mysqlnd \ + php81-opcache \ + php81-pdo_mysql \ + php81-pdo_odbc \ + php81-pdo_pgsql \ + php81-pdo_sqlite \ + php81-pear \ + php81-pecl-apcu \ + php81-pecl-mailparse \ + php81-pecl-mcrypt \ + php81-pecl-memcached \ + php81-pecl-redis \ + php81-pgsql \ + php81-phar \ + php81-posix \ + php81-soap \ + php81-sockets \ + php81-sodium \ + php81-sqlite3 \ + php81-tokenizer \ + php81-xmlreader \ + php81-xsl \ + php81-zip \ whois && \ apk add --no-cache \ --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \ - php8-pecl-xmlrpc && \ + php81-pecl-xmlrpc && \ echo "**** install certbot plugins ****" && \ if [ -z ${CERTBOT_VERSION+x} ]; then \ - CERTBOT="certbot"; \ - else \ - CERTBOT="certbot==${CERTBOT_VERSION}"; \ + CERTBOT_VERSION=$(curl -sL https://pypi.python.org/pypi/certbot/json |jq -r '. | .info.version'); \ fi && \ - pip3 install -U \ - pip wheel && \ - pip install -U --find-links https://wheel-index.linuxserver.io/alpine-3.15/ \ + python3 -m ensurepip && \ + pip3 install -U --no-cache-dir \ + pip \ + wheel && \ + pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \ acme==${CERTBOT_VERSION} \ - ${CERTBOT} \ + certbot==${CERTBOT_VERSION} \ certbot-dns-acmedns \ certbot-dns-aliyun \ certbot-dns-azure \ @@ -141,6 +136,7 @@ RUN \ certbot-dns-vultr \ certbot-plugin-gandi \ cryptography \ + future \ requests && \ echo "**** enable OCSP stapling from base ****" && \ sed -i \ @@ -176,14 +172,10 @@ RUN \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ - for cleanfiles in *.pyc *.pyo; \ - do \ - find /usr/lib/python3.* -iname "${cleanfiles}" -exec rm -f '{}' + \ - ; done && \ rm -rf \ /tmp/* \ - /root/.cache \ - /root/.cargo + $HOME/.cache \ + $HOME/.cargo # copy local files COPY root/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index a114459..7092d9a 100755 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,6 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.15 +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.17 # set version label ARG BUILD_DATE @@ -14,9 +16,8 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ + build-base \ cargo \ - g++ \ - gcc \ libffi-dev \ libxml2-dev \ libxslt-dev \ @@ -24,11 +25,9 @@ RUN \ python3-dev && \ echo "**** install runtime packages ****" && \ apk add --no-cache --upgrade \ - curl \ fail2ban \ gnupg \ memcached \ - nginx \ nginx-mod-http-brotli \ nginx-mod-http-dav-ext \ nginx-mod-http-echo \ @@ -46,62 +45,58 @@ RUN \ nginx-mod-stream \ nginx-mod-stream-geoip2 \ nginx-vim \ - php8-bcmath \ - php8-bz2 \ - php8-ctype \ - php8-curl \ - php8-dom \ - php8-exif \ - php8-ftp \ - php8-gd \ - php8-gmp \ - php8-iconv \ - php8-imap \ - php8-intl \ - php8-ldap \ - php8-mysqli \ - php8-mysqlnd \ - php8-opcache \ - php8-pdo_mysql \ - php8-pdo_odbc \ - php8-pdo_pgsql \ - php8-pdo_sqlite \ - php8-pear \ - php8-pecl-apcu \ - php8-pecl-mailparse \ - php8-pecl-mcrypt \ - php8-pecl-memcached \ - php8-pecl-redis \ - php8-pgsql \ - php8-phar \ - php8-posix \ - php8-soap \ - php8-sockets \ - php8-sodium \ - php8-sqlite3 \ - php8-tokenizer \ - php8-xml \ - php8-xmlreader \ - php8-xsl \ - php8-zip \ - py3-cryptography \ - py3-future \ - py3-pip \ + php81-bcmath \ + php81-bz2 \ + php81-ctype \ + php81-curl \ + php81-dom \ + php81-exif \ + php81-ftp \ + php81-gd \ + php81-gmp \ + php81-iconv \ + php81-imap \ + php81-intl \ + php81-ldap \ + php81-mysqli \ + php81-mysqlnd \ + php81-opcache \ + php81-pdo_mysql \ + php81-pdo_odbc \ + php81-pdo_pgsql \ + php81-pdo_sqlite \ + php81-pear \ + php81-pecl-apcu \ + php81-pecl-mailparse \ + php81-pecl-mcrypt \ + php81-pecl-memcached \ + php81-pecl-redis \ + php81-pgsql \ + php81-phar \ + php81-posix \ + php81-soap \ + php81-sockets \ + php81-sodium \ + php81-sqlite3 \ + php81-tokenizer \ + php81-xmlreader \ + php81-xsl \ + php81-zip \ whois && \ apk add --no-cache \ --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \ - php8-pecl-xmlrpc && \ + php81-pecl-xmlrpc && \ echo "**** install certbot plugins ****" && \ if [ -z ${CERTBOT_VERSION+x} ]; then \ - CERTBOT="certbot"; \ - else \ - CERTBOT="certbot==${CERTBOT_VERSION}"; \ + CERTBOT_VERSION=$(curl -sL https://pypi.python.org/pypi/certbot/json |jq -r '. | .info.version'); \ fi && \ - pip3 install -U \ - pip wheel && \ - pip install -U --find-links https://wheel-index.linuxserver.io/alpine-3.15/ \ + python3 -m ensurepip && \ + pip3 install -U --no-cache-dir \ + pip \ + wheel && \ + pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \ acme==${CERTBOT_VERSION} \ - ${CERTBOT} \ + certbot==${CERTBOT_VERSION} \ certbot-dns-acmedns \ certbot-dns-aliyun \ certbot-dns-azure \ @@ -141,6 +136,7 @@ RUN \ certbot-dns-vultr \ certbot-plugin-gandi \ cryptography \ + future \ requests && \ echo "**** enable OCSP stapling from base ****" && \ sed -i \ @@ -176,14 +172,10 @@ RUN \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ - for cleanfiles in *.pyc *.pyo; \ - do \ - find /usr/lib/python3.* -iname "${cleanfiles}" -exec rm -f '{}' + \ - ; done && \ rm -rf \ /tmp/* \ - /root/.cache \ - /root/.cargo + $HOME/.cache \ + $HOME/.cargo # copy local files COPY root/ / diff --git a/README.md b/README.md index 51d5465..e437d07 100755 --- a/README.md +++ b/README.md @@ -335,6 +335,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **20.01.23:** - Rebase to alpine 3.17 with php8.1. * **16.01.23:** - Remove nchan module because it keeps causing crashes. * **08.12.22:** - Revamp certbot init. * **03.12.22:** - Remove defunct cloudxns plugin. diff --git a/readme-vars.yml b/readme-vars.yml index a98d47d..afdd04f 100755 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -154,6 +154,7 @@ app_setup_block: | # changelog changelogs: + - { date: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1." } - { date: "16.01.23:", desc: "Remove nchan module because it keeps causing crashes." } - { date: "08.12.22:", desc: "Revamp certbot init."} - { date: "03.12.22:", desc: "Remove defunct cloudxns plugin."} diff --git a/root/etc/cont-init.d/43-crontabs b/root/etc/cont-init.d/43-crontabs deleted file mode 100644 index 30065b7..0000000 --- a/root/etc/cont-init.d/43-crontabs +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/with-contenv bash -# shellcheck shell=bash - -# copy crontabs if needed -if [[ ! -f /config/crontabs/root ]]; then - cp /etc/crontabs/root /config/crontabs/ -fi - -# import user crontabs -rm /etc/crontabs/* -cp /config/crontabs/* /etc/crontabs/ diff --git a/root/etc/s6-overlay/s6-rc.d/init-certbot-config/dependencies.d/init-nginx-config b/root/etc/s6-overlay/s6-rc.d/init-certbot-config/dependencies.d/init-nginx-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/50-certbot b/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run old mode 100644 new mode 100755 similarity index 99% rename from root/etc/cont-init.d/50-certbot rename to root/etc/s6-overlay/s6-rc.d/init-certbot-config/run index 30656e3..e1a7d47 --- a/root/etc/cont-init.d/50-certbot +++ b/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run @@ -31,12 +31,12 @@ fi # copy dns default configs cp -n /defaults/dns-conf/* /config/dns-conf/ -chown -R abc:abc /config/dns-conf +lsiown -R abc:abc /config/dns-conf # copy default renewal hooks chmod -R +x /defaults/etc/letsencrypt/renewal-hooks cp -nR /defaults/etc/letsencrypt/renewal-hooks/* /config/etc/letsencrypt/renewal-hooks/ -chown -R abc:abc /config/etc/letsencrypt/renewal-hooks +lsiown -R abc:abc /config/etc/letsencrypt/renewal-hooks # create original config file if it doesn't exist, move non-hidden legacy file to hidden if [[ -f "/config/donoteditthisfile.conf" ]]; then diff --git a/root/etc/s6-overlay/s6-rc.d/init-certbot-config/type b/root/etc/s6-overlay/s6-rc.d/init-certbot-config/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-certbot-config/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-certbot-config/up b/root/etc/s6-overlay/s6-rc.d/init-certbot-config/up new file mode 100644 index 0000000..c8bbd6e --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-certbot-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-certbot-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-outdated-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-outdated-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/dependencies.d/init-fail2ban-config b/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/dependencies.d/init-fail2ban-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/run b/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/run new file mode 100755 index 0000000..5ca0899 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/run @@ -0,0 +1,17 @@ +#!/usr/bin/with-contenv bash +# shellcheck shell=bash + +# if root crontabs do not exist in config +# copy root crontab from system +if [[ ! -f /config/crontabs/root ]] && crontab -l -u root; then + crontab -l -u root >/config/crontabs/root +fi + +# if root crontabs still do not exist in config (were not copied from system) +# copy root crontab from included defaults +if [[ ! -f /config/crontabs/root ]]; then + cp /etc/crontabs/root /config/crontabs/ +fi + +# import user crontabs +crontab -u root /config/crontabs/root diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/type b/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/up b/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/up new file mode 100644 index 0000000..006d814 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-crontabs-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-fail2ban-config/dependencies.d/init-samples-config b/root/etc/s6-overlay/s6-rc.d/init-fail2ban-config/dependencies.d/init-samples-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/42-fail2ban b/root/etc/s6-overlay/s6-rc.d/init-fail2ban-config/run old mode 100644 new mode 100755 similarity index 100% rename from root/etc/cont-init.d/42-fail2ban rename to root/etc/s6-overlay/s6-rc.d/init-fail2ban-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-fail2ban-config/type b/root/etc/s6-overlay/s6-rc.d/init-fail2ban-config/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-fail2ban-config/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-fail2ban-config/up b/root/etc/s6-overlay/s6-rc.d/init-fail2ban-config/up new file mode 100644 index 0000000..e2e5256 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-fail2ban-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-fail2ban-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-folders-config/dependencies.d/init-require-url b/root/etc/s6-overlay/s6-rc.d/init-folders-config/dependencies.d/init-require-url new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/40-folders b/root/etc/s6-overlay/s6-rc.d/init-folders-config/run old mode 100644 new mode 100755 similarity index 100% rename from root/etc/cont-init.d/40-folders rename to root/etc/s6-overlay/s6-rc.d/init-folders-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-folders-config/type b/root/etc/s6-overlay/s6-rc.d/init-folders-config/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-folders-config/type @@ -0,0 +1 @@ +oneshot 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 new file mode 100644 index 0000000..7607e6f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-folders-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-folders-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-nginx-config/dependencies.d/init-crontabs-config b/root/etc/s6-overlay/s6-rc.d/init-nginx-config/dependencies.d/init-crontabs-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/45-nginx b/root/etc/s6-overlay/s6-rc.d/init-nginx-config/run old mode 100644 new mode 100755 similarity index 100% rename from root/etc/cont-init.d/45-nginx rename to root/etc/s6-overlay/s6-rc.d/init-nginx-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-nginx-config/type b/root/etc/s6-overlay/s6-rc.d/init-nginx-config/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-nginx-config/type @@ -0,0 +1 @@ +oneshot 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 new file mode 100644 index 0000000..9adcea4 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-nginx-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-nginx-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-outdated-config/dependencies.d/init-renew b/root/etc/s6-overlay/s6-rc.d/init-outdated-config/dependencies.d/init-renew new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/70-outdated b/root/etc/s6-overlay/s6-rc.d/init-outdated-config/run old mode 100644 new mode 100755 similarity index 100% rename from root/etc/cont-init.d/70-outdated rename to root/etc/s6-overlay/s6-rc.d/init-outdated-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-outdated-config/type b/root/etc/s6-overlay/s6-rc.d/init-outdated-config/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-outdated-config/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-outdated-config/up b/root/etc/s6-overlay/s6-rc.d/init-outdated-config/up new file mode 100644 index 0000000..9257bfe --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-outdated-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-outdated-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-permissions-config/dependencies.d/init-certbot-config b/root/etc/s6-overlay/s6-rc.d/init-permissions-config/dependencies.d/init-certbot-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/55-permissions b/root/etc/s6-overlay/s6-rc.d/init-permissions-config/run old mode 100644 new mode 100755 similarity index 88% rename from root/etc/cont-init.d/55-permissions rename to root/etc/s6-overlay/s6-rc.d/init-permissions-config/run index 4c50bd8..3a55fc0 --- a/root/etc/cont-init.d/55-permissions +++ b/root/etc/s6-overlay/s6-rc.d/init-permissions-config/run @@ -2,7 +2,7 @@ # shellcheck shell=bash # permissions -chown -R abc:abc \ +lsiown -R abc:abc \ /config chmod -R 0644 /etc/logrotate.d chmod -R +r /config/log diff --git a/root/etc/s6-overlay/s6-rc.d/init-permissions-config/type b/root/etc/s6-overlay/s6-rc.d/init-permissions-config/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-permissions-config/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-permissions-config/up b/root/etc/s6-overlay/s6-rc.d/init-permissions-config/up new file mode 100644 index 0000000..6f2202f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-permissions-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-permissions-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-renew/dependencies.d/init-permissions-config b/root/etc/s6-overlay/s6-rc.d/init-renew/dependencies.d/init-permissions-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/60-renew b/root/etc/s6-overlay/s6-rc.d/init-renew/run old mode 100644 new mode 100755 similarity index 100% rename from root/etc/cont-init.d/60-renew rename to root/etc/s6-overlay/s6-rc.d/init-renew/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-renew/type b/root/etc/s6-overlay/s6-rc.d/init-renew/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-renew/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-renew/up b/root/etc/s6-overlay/s6-rc.d/init-renew/up new file mode 100644 index 0000000..285a1f4 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-renew/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-renew/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-require-url/dependencies.d/init-test-run b/root/etc/s6-overlay/s6-rc.d/init-require-url/dependencies.d/init-test-run new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/31-require-url b/root/etc/s6-overlay/s6-rc.d/init-require-url/run old mode 100644 new mode 100755 similarity index 100% rename from root/etc/cont-init.d/31-require-url rename to root/etc/s6-overlay/s6-rc.d/init-require-url/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-require-url/type b/root/etc/s6-overlay/s6-rc.d/init-require-url/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-require-url/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-require-url/up b/root/etc/s6-overlay/s6-rc.d/init-require-url/up new file mode 100644 index 0000000..df39f4d --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-require-url/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-require-url/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-samples-config/dependencies.d/init-folders-config b/root/etc/s6-overlay/s6-rc.d/init-samples-config/dependencies.d/init-folders-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/41-samples b/root/etc/s6-overlay/s6-rc.d/init-samples-config/run old mode 100644 new mode 100755 similarity index 100% rename from root/etc/cont-init.d/41-samples rename to root/etc/s6-overlay/s6-rc.d/init-samples-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-samples-config/type b/root/etc/s6-overlay/s6-rc.d/init-samples-config/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-samples-config/type @@ -0,0 +1 @@ +oneshot 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 new file mode 100644 index 0000000..bc2cbf6 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-samples-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-samples-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-test-run/dependencies.d/init-nginx-end b/root/etc/s6-overlay/s6-rc.d/init-test-run/dependencies.d/init-nginx-end new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/30-test-run b/root/etc/s6-overlay/s6-rc.d/init-test-run/run old mode 100644 new mode 100755 similarity index 100% rename from root/etc/cont-init.d/30-test-run rename to 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 new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-test-run/type @@ -0,0 +1 @@ +oneshot 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 new file mode 100644 index 0000000..5f836df --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-test-run/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-test-run/run diff --git a/root/etc/s6-overlay/s6-rc.d/svc-fail2ban/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-fail2ban/dependencies.d/init-services new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/services.d/fail2ban/run b/root/etc/s6-overlay/s6-rc.d/svc-fail2ban/run old mode 100644 new mode 100755 similarity index 100% rename from root/etc/services.d/fail2ban/run rename to root/etc/s6-overlay/s6-rc.d/svc-fail2ban/run diff --git a/root/etc/s6-overlay/s6-rc.d/svc-fail2ban/type b/root/etc/s6-overlay/s6-rc.d/svc-fail2ban/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-fail2ban/type @@ -0,0 +1 @@ +longrun diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-certbot-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-certbot-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-crontabs-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-crontabs-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-fail2ban-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-fail2ban-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-folders-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-folders-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-nginx-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-nginx-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-outdated-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-outdated-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-permissions-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-permissions-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-renew b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-renew new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-require-url b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-require-url new file mode 100644 index 0000000..e69de29 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 new file mode 100644 index 0000000..e69de29 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 new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-fail2ban b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-fail2ban new file mode 100644 index 0000000..e69de29