From e2e39b9f89c44a489987eb4f538e5cf37fcfbade Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Tue, 27 Apr 2021 10:08:22 -0500 Subject: [PATCH] Format files --- Dockerfile | 284 +++++++++++++------------- Dockerfile.aarch64 | 284 +++++++++++++------------- Dockerfile.armhf | 284 +++++++++++++------------- root/defaults/502.html | 2 +- root/defaults/dns-conf/cloudflare.ini | 2 +- root/defaults/dns-conf/cpanel.ini | 2 +- root/defaults/dns-conf/domeneshop.ini | 2 +- root/defaults/dns-conf/google.json | 2 +- root/defaults/dns-conf/hetzner.ini | 2 +- root/defaults/index.html | 2 +- root/etc/cont-init.d/60-renew | 2 +- 11 files changed, 434 insertions(+), 434 deletions(-) diff --git a/Dockerfile b/Dockerfile index a9ae80b..05554f9 100755 --- a/Dockerfile +++ b/Dockerfile @@ -12,148 +12,148 @@ ENV DHLEVEL=2048 ONLY_SUBDOMAINS=false AWS_CONFIG_FILE=/config/dns-conf/route53. ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - cargo \ - g++ \ - gcc \ - libffi-dev \ - openssl-dev \ - 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 \ - nginx-mod-http-fancyindex \ - nginx-mod-http-geoip2 \ - nginx-mod-http-headers-more \ - nginx-mod-http-image-filter \ - nginx-mod-http-nchan \ - nginx-mod-http-perl \ - nginx-mod-http-redis2 \ - nginx-mod-http-set-misc \ - nginx-mod-http-upload-progress \ - nginx-mod-http-xslt-filter \ - nginx-mod-mail \ - nginx-mod-rtmp \ - nginx-mod-stream \ - nginx-mod-stream-geoip2 \ - nginx-vim \ - php7-bcmath \ - php7-bz2 \ - php7-ctype \ - php7-curl \ - php7-dom \ - php7-exif \ - php7-ftp \ - php7-gd \ - php7-gmp \ - php7-iconv \ - php7-imap \ - php7-intl \ - php7-ldap \ - php7-mcrypt \ - php7-memcached \ - php7-mysqli \ - php7-mysqlnd \ - php7-opcache \ - php7-pdo_mysql \ - php7-pdo_odbc \ - php7-pdo_pgsql \ - php7-pdo_sqlite \ - php7-pear \ - php7-pecl-apcu \ - php7-pecl-mailparse \ - php7-pecl-redis \ - php7-pgsql \ - php7-phar \ - php7-posix \ - php7-soap \ - php7-sockets \ - php7-sodium \ - php7-sqlite3 \ - php7-tokenizer \ - php7-xml \ - php7-xmlreader \ - php7-xmlrpc \ - php7-xsl \ - php7-zip \ - py3-cryptography \ - py3-future \ - py3-pip \ - whois && \ - echo "**** install certbot plugins ****" && \ - if [ -z ${CERTBOT_VERSION+x} ]; then \ - CERTBOT="certbot"; \ - else \ - CERTBOT="certbot==${CERTBOT_VERSION}"; \ - fi && \ - pip3 install -U \ - pip && \ - pip3 install -U \ - ${CERTBOT} \ - certbot-dns-aliyun \ - certbot-dns-cloudflare \ - certbot-dns-cloudxns \ - certbot-dns-cpanel \ - certbot-dns-digitalocean \ - certbot-dns-directadmin \ - certbot-dns-dnsimple \ - certbot-dns-dnsmadeeasy \ - certbot-dns-domeneshop \ - certbot-dns-google \ - certbot-dns-hetzner \ - certbot-dns-inwx \ - certbot-dns-linode \ - certbot-dns-luadns \ - certbot-dns-netcup \ - certbot-dns-njalla \ - certbot-dns-nsone \ - certbot-dns-ovh \ - certbot-dns-rfc2136 \ - certbot-dns-route53 \ - certbot-dns-transip \ - certbot-dns-vultr \ - certbot-plugin-gandi \ - cryptography \ - requests && \ - echo "**** remove unnecessary fail2ban filters ****" && \ - rm \ - /etc/fail2ban/jail.d/alpine-ssh.conf && \ - echo "**** copy fail2ban default action and filter to /default ****" && \ - mkdir -p /defaults/fail2ban && \ - mv /etc/fail2ban/action.d /defaults/fail2ban/ && \ - mv /etc/fail2ban/filter.d /defaults/fail2ban/ && \ - echo "**** copy proxy confs to /default ****" && \ - mkdir -p /defaults/proxy-confs && \ - curl -o \ - /tmp/proxy.tar.gz -L \ - "https://github.com/linuxserver/reverse-proxy-confs/tarball/master" && \ - tar xf \ - /tmp/proxy.tar.gz -C \ - /defaults/proxy-confs --strip-components=1 --exclude=linux*/.gitattributes --exclude=linux*/.github --exclude=linux*/.gitignore --exclude=linux*/LICENSE && \ - echo "**** configure nginx ****" && \ - rm -f /etc/nginx/conf.d/default.conf && \ - curl -o \ - /defaults/dhparams.pem -L \ - "https://lsio.ams3.digitaloceanspaces.com/dhparams.pem" && \ - 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 + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + cargo \ + g++ \ + gcc \ + libffi-dev \ + openssl-dev \ + 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 \ + nginx-mod-http-fancyindex \ + nginx-mod-http-geoip2 \ + nginx-mod-http-headers-more \ + nginx-mod-http-image-filter \ + nginx-mod-http-nchan \ + nginx-mod-http-perl \ + nginx-mod-http-redis2 \ + nginx-mod-http-set-misc \ + nginx-mod-http-upload-progress \ + nginx-mod-http-xslt-filter \ + nginx-mod-mail \ + nginx-mod-rtmp \ + nginx-mod-stream \ + nginx-mod-stream-geoip2 \ + nginx-vim \ + php7-bcmath \ + php7-bz2 \ + php7-ctype \ + php7-curl \ + php7-dom \ + php7-exif \ + php7-ftp \ + php7-gd \ + php7-gmp \ + php7-iconv \ + php7-imap \ + php7-intl \ + php7-ldap \ + php7-mcrypt \ + php7-memcached \ + php7-mysqli \ + php7-mysqlnd \ + php7-opcache \ + php7-pdo_mysql \ + php7-pdo_odbc \ + php7-pdo_pgsql \ + php7-pdo_sqlite \ + php7-pear \ + php7-pecl-apcu \ + php7-pecl-mailparse \ + php7-pecl-redis \ + php7-pgsql \ + php7-phar \ + php7-posix \ + php7-soap \ + php7-sockets \ + php7-sodium \ + php7-sqlite3 \ + php7-tokenizer \ + php7-xml \ + php7-xmlreader \ + php7-xmlrpc \ + php7-xsl \ + php7-zip \ + py3-cryptography \ + py3-future \ + py3-pip \ + whois && \ + echo "**** install certbot plugins ****" && \ + if [ -z ${CERTBOT_VERSION+x} ]; then \ + CERTBOT="certbot"; \ + else \ + CERTBOT="certbot==${CERTBOT_VERSION}"; \ + fi && \ + pip3 install -U \ + pip && \ + pip3 install -U \ + ${CERTBOT} \ + certbot-dns-aliyun \ + certbot-dns-cloudflare \ + certbot-dns-cloudxns \ + certbot-dns-cpanel \ + certbot-dns-digitalocean \ + certbot-dns-directadmin \ + certbot-dns-dnsimple \ + certbot-dns-dnsmadeeasy \ + certbot-dns-domeneshop \ + certbot-dns-google \ + certbot-dns-hetzner \ + certbot-dns-inwx \ + certbot-dns-linode \ + certbot-dns-luadns \ + certbot-dns-netcup \ + certbot-dns-njalla \ + certbot-dns-nsone \ + certbot-dns-ovh \ + certbot-dns-rfc2136 \ + certbot-dns-route53 \ + certbot-dns-transip \ + certbot-dns-vultr \ + certbot-plugin-gandi \ + cryptography \ + requests && \ + echo "**** remove unnecessary fail2ban filters ****" && \ + rm \ + /etc/fail2ban/jail.d/alpine-ssh.conf && \ + echo "**** copy fail2ban default action and filter to /default ****" && \ + mkdir -p /defaults/fail2ban && \ + mv /etc/fail2ban/action.d /defaults/fail2ban/ && \ + mv /etc/fail2ban/filter.d /defaults/fail2ban/ && \ + echo "**** copy proxy confs to /default ****" && \ + mkdir -p /defaults/proxy-confs && \ + curl -o \ + /tmp/proxy.tar.gz -L \ + "https://github.com/linuxserver/reverse-proxy-confs/tarball/master" && \ + tar xf \ + /tmp/proxy.tar.gz -C \ + /defaults/proxy-confs --strip-components=1 --exclude=linux*/.gitattributes --exclude=linux*/.github --exclude=linux*/.gitignore --exclude=linux*/LICENSE && \ + echo "**** configure nginx ****" && \ + rm -f /etc/nginx/conf.d/default.conf && \ + curl -o \ + /defaults/dhparams.pem -L \ + "https://lsio.ams3.digitaloceanspaces.com/dhparams.pem" && \ + 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 # add local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 4e24add..5733dd4 100755 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -12,148 +12,148 @@ ENV DHLEVEL=2048 ONLY_SUBDOMAINS=false AWS_CONFIG_FILE=/config/dns-conf/route53. ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - cargo \ - g++ \ - gcc \ - libffi-dev \ - openssl-dev \ - 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 \ - nginx-mod-http-fancyindex \ - nginx-mod-http-geoip2 \ - nginx-mod-http-headers-more \ - nginx-mod-http-image-filter \ - nginx-mod-http-nchan \ - nginx-mod-http-perl \ - nginx-mod-http-redis2 \ - nginx-mod-http-set-misc \ - nginx-mod-http-upload-progress \ - nginx-mod-http-xslt-filter \ - nginx-mod-mail \ - nginx-mod-rtmp \ - nginx-mod-stream \ - nginx-mod-stream-geoip2 \ - nginx-vim \ - php7-bcmath \ - php7-bz2 \ - php7-ctype \ - php7-curl \ - php7-dom \ - php7-exif \ - php7-ftp \ - php7-gd \ - php7-gmp \ - php7-iconv \ - php7-imap \ - php7-intl \ - php7-ldap \ - php7-mcrypt \ - php7-memcached \ - php7-mysqli \ - php7-mysqlnd \ - php7-opcache \ - php7-pdo_mysql \ - php7-pdo_odbc \ - php7-pdo_pgsql \ - php7-pdo_sqlite \ - php7-pear \ - php7-pecl-apcu \ - php7-pecl-mailparse \ - php7-pecl-redis \ - php7-pgsql \ - php7-phar \ - php7-posix \ - php7-soap \ - php7-sockets \ - php7-sodium \ - php7-sqlite3 \ - php7-tokenizer \ - php7-xml \ - php7-xmlreader \ - php7-xmlrpc \ - php7-xsl \ - php7-zip \ - py3-cryptography \ - py3-future \ - py3-pip \ - whois && \ - echo "**** install certbot plugins ****" && \ - if [ -z ${CERTBOT_VERSION+x} ]; then \ - CERTBOT="certbot"; \ - else \ - CERTBOT="certbot==${CERTBOT_VERSION}"; \ - fi && \ - pip3 install -U \ - pip && \ - pip3 install -U \ - ${CERTBOT} \ - certbot-dns-aliyun \ - certbot-dns-cloudflare \ - certbot-dns-cloudxns \ - certbot-dns-cpanel \ - certbot-dns-digitalocean \ - certbot-dns-directadmin \ - certbot-dns-dnsimple \ - certbot-dns-dnsmadeeasy \ - certbot-dns-domeneshop \ - certbot-dns-google \ - certbot-dns-hetzner \ - certbot-dns-inwx \ - certbot-dns-linode \ - certbot-dns-luadns \ - certbot-dns-netcup \ - certbot-dns-njalla \ - certbot-dns-nsone \ - certbot-dns-ovh \ - certbot-dns-rfc2136 \ - certbot-dns-route53 \ - certbot-dns-transip \ - certbot-dns-vultr \ - certbot-plugin-gandi \ - cryptography \ - requests && \ - echo "**** remove unnecessary fail2ban filters ****" && \ - rm \ - /etc/fail2ban/jail.d/alpine-ssh.conf && \ - echo "**** copy fail2ban default action and filter to /default ****" && \ - mkdir -p /defaults/fail2ban && \ - mv /etc/fail2ban/action.d /defaults/fail2ban/ && \ - mv /etc/fail2ban/filter.d /defaults/fail2ban/ && \ - echo "**** copy proxy confs to /default ****" && \ - mkdir -p /defaults/proxy-confs && \ - curl -o \ - /tmp/proxy.tar.gz -L \ - "https://github.com/linuxserver/reverse-proxy-confs/tarball/master" && \ - tar xf \ - /tmp/proxy.tar.gz -C \ - /defaults/proxy-confs --strip-components=1 --exclude=linux*/.gitattributes --exclude=linux*/.github --exclude=linux*/.gitignore --exclude=linux*/LICENSE && \ - echo "**** configure nginx ****" && \ - rm -f /etc/nginx/conf.d/default.conf && \ - curl -o \ - /defaults/dhparams.pem -L \ - "https://lsio.ams3.digitaloceanspaces.com/dhparams.pem" && \ - 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 + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + cargo \ + g++ \ + gcc \ + libffi-dev \ + openssl-dev \ + 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 \ + nginx-mod-http-fancyindex \ + nginx-mod-http-geoip2 \ + nginx-mod-http-headers-more \ + nginx-mod-http-image-filter \ + nginx-mod-http-nchan \ + nginx-mod-http-perl \ + nginx-mod-http-redis2 \ + nginx-mod-http-set-misc \ + nginx-mod-http-upload-progress \ + nginx-mod-http-xslt-filter \ + nginx-mod-mail \ + nginx-mod-rtmp \ + nginx-mod-stream \ + nginx-mod-stream-geoip2 \ + nginx-vim \ + php7-bcmath \ + php7-bz2 \ + php7-ctype \ + php7-curl \ + php7-dom \ + php7-exif \ + php7-ftp \ + php7-gd \ + php7-gmp \ + php7-iconv \ + php7-imap \ + php7-intl \ + php7-ldap \ + php7-mcrypt \ + php7-memcached \ + php7-mysqli \ + php7-mysqlnd \ + php7-opcache \ + php7-pdo_mysql \ + php7-pdo_odbc \ + php7-pdo_pgsql \ + php7-pdo_sqlite \ + php7-pear \ + php7-pecl-apcu \ + php7-pecl-mailparse \ + php7-pecl-redis \ + php7-pgsql \ + php7-phar \ + php7-posix \ + php7-soap \ + php7-sockets \ + php7-sodium \ + php7-sqlite3 \ + php7-tokenizer \ + php7-xml \ + php7-xmlreader \ + php7-xmlrpc \ + php7-xsl \ + php7-zip \ + py3-cryptography \ + py3-future \ + py3-pip \ + whois && \ + echo "**** install certbot plugins ****" && \ + if [ -z ${CERTBOT_VERSION+x} ]; then \ + CERTBOT="certbot"; \ + else \ + CERTBOT="certbot==${CERTBOT_VERSION}"; \ + fi && \ + pip3 install -U \ + pip && \ + pip3 install -U \ + ${CERTBOT} \ + certbot-dns-aliyun \ + certbot-dns-cloudflare \ + certbot-dns-cloudxns \ + certbot-dns-cpanel \ + certbot-dns-digitalocean \ + certbot-dns-directadmin \ + certbot-dns-dnsimple \ + certbot-dns-dnsmadeeasy \ + certbot-dns-domeneshop \ + certbot-dns-google \ + certbot-dns-hetzner \ + certbot-dns-inwx \ + certbot-dns-linode \ + certbot-dns-luadns \ + certbot-dns-netcup \ + certbot-dns-njalla \ + certbot-dns-nsone \ + certbot-dns-ovh \ + certbot-dns-rfc2136 \ + certbot-dns-route53 \ + certbot-dns-transip \ + certbot-dns-vultr \ + certbot-plugin-gandi \ + cryptography \ + requests && \ + echo "**** remove unnecessary fail2ban filters ****" && \ + rm \ + /etc/fail2ban/jail.d/alpine-ssh.conf && \ + echo "**** copy fail2ban default action and filter to /default ****" && \ + mkdir -p /defaults/fail2ban && \ + mv /etc/fail2ban/action.d /defaults/fail2ban/ && \ + mv /etc/fail2ban/filter.d /defaults/fail2ban/ && \ + echo "**** copy proxy confs to /default ****" && \ + mkdir -p /defaults/proxy-confs && \ + curl -o \ + /tmp/proxy.tar.gz -L \ + "https://github.com/linuxserver/reverse-proxy-confs/tarball/master" && \ + tar xf \ + /tmp/proxy.tar.gz -C \ + /defaults/proxy-confs --strip-components=1 --exclude=linux*/.gitattributes --exclude=linux*/.github --exclude=linux*/.gitignore --exclude=linux*/LICENSE && \ + echo "**** configure nginx ****" && \ + rm -f /etc/nginx/conf.d/default.conf && \ + curl -o \ + /defaults/dhparams.pem -L \ + "https://lsio.ams3.digitaloceanspaces.com/dhparams.pem" && \ + 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 # add local files COPY root/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 0083a0f..a4f8789 100755 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -12,148 +12,148 @@ ENV DHLEVEL=2048 ONLY_SUBDOMAINS=false AWS_CONFIG_FILE=/config/dns-conf/route53. ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - cargo \ - g++ \ - gcc \ - libffi-dev \ - openssl-dev \ - 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 \ - nginx-mod-http-fancyindex \ - nginx-mod-http-geoip2 \ - nginx-mod-http-headers-more \ - nginx-mod-http-image-filter \ - nginx-mod-http-nchan \ - nginx-mod-http-perl \ - nginx-mod-http-redis2 \ - nginx-mod-http-set-misc \ - nginx-mod-http-upload-progress \ - nginx-mod-http-xslt-filter \ - nginx-mod-mail \ - nginx-mod-rtmp \ - nginx-mod-stream \ - nginx-mod-stream-geoip2 \ - nginx-vim \ - php7-bcmath \ - php7-bz2 \ - php7-ctype \ - php7-curl \ - php7-dom \ - php7-exif \ - php7-ftp \ - php7-gd \ - php7-gmp \ - php7-iconv \ - php7-imap \ - php7-intl \ - php7-ldap \ - php7-mcrypt \ - php7-memcached \ - php7-mysqli \ - php7-mysqlnd \ - php7-opcache \ - php7-pdo_mysql \ - php7-pdo_odbc \ - php7-pdo_pgsql \ - php7-pdo_sqlite \ - php7-pear \ - php7-pecl-apcu \ - php7-pecl-mailparse \ - php7-pecl-redis \ - php7-pgsql \ - php7-phar \ - php7-posix \ - php7-soap \ - php7-sockets \ - php7-sodium \ - php7-sqlite3 \ - php7-tokenizer \ - php7-xml \ - php7-xmlreader \ - php7-xmlrpc \ - php7-xsl \ - php7-zip \ - py3-cryptography \ - py3-future \ - py3-pip \ - whois && \ - echo "**** install certbot plugins ****" && \ - if [ -z ${CERTBOT_VERSION+x} ]; then \ - CERTBOT="certbot"; \ - else \ - CERTBOT="certbot==${CERTBOT_VERSION}"; \ - fi && \ - pip3 install -U \ - pip && \ - pip3 install -U \ - ${CERTBOT} \ - certbot-dns-aliyun \ - certbot-dns-cloudflare \ - certbot-dns-cloudxns \ - certbot-dns-cpanel \ - certbot-dns-digitalocean \ - certbot-dns-directadmin \ - certbot-dns-dnsimple \ - certbot-dns-dnsmadeeasy \ - certbot-dns-domeneshop \ - certbot-dns-google \ - certbot-dns-hetzner \ - certbot-dns-inwx \ - certbot-dns-linode \ - certbot-dns-luadns \ - certbot-dns-netcup \ - certbot-dns-njalla \ - certbot-dns-nsone \ - certbot-dns-ovh \ - certbot-dns-rfc2136 \ - certbot-dns-route53 \ - certbot-dns-transip \ - certbot-dns-vultr \ - certbot-plugin-gandi \ - cryptography \ - requests && \ - echo "**** remove unnecessary fail2ban filters ****" && \ - rm \ - /etc/fail2ban/jail.d/alpine-ssh.conf && \ - echo "**** copy fail2ban default action and filter to /default ****" && \ - mkdir -p /defaults/fail2ban && \ - mv /etc/fail2ban/action.d /defaults/fail2ban/ && \ - mv /etc/fail2ban/filter.d /defaults/fail2ban/ && \ - echo "**** copy proxy confs to /default ****" && \ - mkdir -p /defaults/proxy-confs && \ - curl -o \ - /tmp/proxy.tar.gz -L \ - "https://github.com/linuxserver/reverse-proxy-confs/tarball/master" && \ - tar xf \ - /tmp/proxy.tar.gz -C \ - /defaults/proxy-confs --strip-components=1 --exclude=linux*/.gitattributes --exclude=linux*/.github --exclude=linux*/.gitignore --exclude=linux*/LICENSE && \ - echo "**** configure nginx ****" && \ - rm -f /etc/nginx/conf.d/default.conf && \ - curl -o \ - /defaults/dhparams.pem -L \ - "https://lsio.ams3.digitaloceanspaces.com/dhparams.pem" && \ - 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 + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + cargo \ + g++ \ + gcc \ + libffi-dev \ + openssl-dev \ + 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 \ + nginx-mod-http-fancyindex \ + nginx-mod-http-geoip2 \ + nginx-mod-http-headers-more \ + nginx-mod-http-image-filter \ + nginx-mod-http-nchan \ + nginx-mod-http-perl \ + nginx-mod-http-redis2 \ + nginx-mod-http-set-misc \ + nginx-mod-http-upload-progress \ + nginx-mod-http-xslt-filter \ + nginx-mod-mail \ + nginx-mod-rtmp \ + nginx-mod-stream \ + nginx-mod-stream-geoip2 \ + nginx-vim \ + php7-bcmath \ + php7-bz2 \ + php7-ctype \ + php7-curl \ + php7-dom \ + php7-exif \ + php7-ftp \ + php7-gd \ + php7-gmp \ + php7-iconv \ + php7-imap \ + php7-intl \ + php7-ldap \ + php7-mcrypt \ + php7-memcached \ + php7-mysqli \ + php7-mysqlnd \ + php7-opcache \ + php7-pdo_mysql \ + php7-pdo_odbc \ + php7-pdo_pgsql \ + php7-pdo_sqlite \ + php7-pear \ + php7-pecl-apcu \ + php7-pecl-mailparse \ + php7-pecl-redis \ + php7-pgsql \ + php7-phar \ + php7-posix \ + php7-soap \ + php7-sockets \ + php7-sodium \ + php7-sqlite3 \ + php7-tokenizer \ + php7-xml \ + php7-xmlreader \ + php7-xmlrpc \ + php7-xsl \ + php7-zip \ + py3-cryptography \ + py3-future \ + py3-pip \ + whois && \ + echo "**** install certbot plugins ****" && \ + if [ -z ${CERTBOT_VERSION+x} ]; then \ + CERTBOT="certbot"; \ + else \ + CERTBOT="certbot==${CERTBOT_VERSION}"; \ + fi && \ + pip3 install -U \ + pip && \ + pip3 install -U \ + ${CERTBOT} \ + certbot-dns-aliyun \ + certbot-dns-cloudflare \ + certbot-dns-cloudxns \ + certbot-dns-cpanel \ + certbot-dns-digitalocean \ + certbot-dns-directadmin \ + certbot-dns-dnsimple \ + certbot-dns-dnsmadeeasy \ + certbot-dns-domeneshop \ + certbot-dns-google \ + certbot-dns-hetzner \ + certbot-dns-inwx \ + certbot-dns-linode \ + certbot-dns-luadns \ + certbot-dns-netcup \ + certbot-dns-njalla \ + certbot-dns-nsone \ + certbot-dns-ovh \ + certbot-dns-rfc2136 \ + certbot-dns-route53 \ + certbot-dns-transip \ + certbot-dns-vultr \ + certbot-plugin-gandi \ + cryptography \ + requests && \ + echo "**** remove unnecessary fail2ban filters ****" && \ + rm \ + /etc/fail2ban/jail.d/alpine-ssh.conf && \ + echo "**** copy fail2ban default action and filter to /default ****" && \ + mkdir -p /defaults/fail2ban && \ + mv /etc/fail2ban/action.d /defaults/fail2ban/ && \ + mv /etc/fail2ban/filter.d /defaults/fail2ban/ && \ + echo "**** copy proxy confs to /default ****" && \ + mkdir -p /defaults/proxy-confs && \ + curl -o \ + /tmp/proxy.tar.gz -L \ + "https://github.com/linuxserver/reverse-proxy-confs/tarball/master" && \ + tar xf \ + /tmp/proxy.tar.gz -C \ + /defaults/proxy-confs --strip-components=1 --exclude=linux*/.gitattributes --exclude=linux*/.github --exclude=linux*/.gitignore --exclude=linux*/LICENSE && \ + echo "**** configure nginx ****" && \ + rm -f /etc/nginx/conf.d/default.conf && \ + curl -o \ + /defaults/dhparams.pem -L \ + "https://lsio.ams3.digitaloceanspaces.com/dhparams.pem" && \ + 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 # add local files COPY root/ / diff --git a/root/defaults/502.html b/root/defaults/502.html index ff7d8fc..6e33c60 100644 --- a/root/defaults/502.html +++ b/root/defaults/502.html @@ -41,4 +41,4 @@

For help and support, please visit: linuxserver.io/support

- \ No newline at end of file + diff --git a/root/defaults/dns-conf/cloudflare.ini b/root/defaults/dns-conf/cloudflare.ini index 5cd3c0a..af7194b 100644 --- a/root/defaults/dns-conf/cloudflare.ini +++ b/root/defaults/dns-conf/cloudflare.ini @@ -6,4 +6,4 @@ dns_cloudflare_email = cloudflare@example.com dns_cloudflare_api_key = 0123456789abcdef0123456789abcdef01234567 # With token (comment out both lines above and uncomment below): -#dns_cloudflare_api_token = 0123456789abcdef0123456789abcdef01234567 \ No newline at end of file +#dns_cloudflare_api_token = 0123456789abcdef0123456789abcdef01234567 diff --git a/root/defaults/dns-conf/cpanel.ini b/root/defaults/dns-conf/cpanel.ini index 28b6953..2c2742b 100644 --- a/root/defaults/dns-conf/cpanel.ini +++ b/root/defaults/dns-conf/cpanel.ini @@ -3,4 +3,4 @@ # include the scheme and the port number (usually 2083 for https) certbot_dns_cpanel:cpanel_url = https://cpanel.example.com:2083 certbot_dns_cpanel:cpanel_username = username -certbot_dns_cpanel:cpanel_password = 1234567890abcdef \ No newline at end of file +certbot_dns_cpanel:cpanel_password = 1234567890abcdef diff --git a/root/defaults/dns-conf/domeneshop.ini b/root/defaults/dns-conf/domeneshop.ini index 569c713..0bd1d0d 100644 --- a/root/defaults/dns-conf/domeneshop.ini +++ b/root/defaults/dns-conf/domeneshop.ini @@ -1,4 +1,4 @@ # Instructions: https://github.com/domeneshop/certbot-dns-domeneshop#credentials # Replace with your values dns_domeneshop_client_token=1234567890abcdef -dns_domeneshop_client_secret=1234567890abcdefghijklmnopqrstuvxyz1234567890abcdefghijklmnopqrs \ No newline at end of file +dns_domeneshop_client_secret=1234567890abcdefghijklmnopqrstuvxyz1234567890abcdefghijklmnopqrs diff --git a/root/defaults/dns-conf/google.json b/root/defaults/dns-conf/google.json index c5a59cf..67f0050 100644 --- a/root/defaults/dns-conf/google.json +++ b/root/defaults/dns-conf/google.json @@ -3,4 +3,4 @@ "_comment": "Replace with your values", "type": "service_account", "rest": "..." -} \ No newline at end of file +} diff --git a/root/defaults/dns-conf/hetzner.ini b/root/defaults/dns-conf/hetzner.ini index f616823..23be699 100644 --- a/root/defaults/dns-conf/hetzner.ini +++ b/root/defaults/dns-conf/hetzner.ini @@ -1,3 +1,3 @@ # Instructions: https://github.com/ctrlaltcoop/certbot-dns-hetzner # Replace with your values -dns_hetzner_api_token = nohnah4zoo9Kiejee9aGh0thoopee2sa \ No newline at end of file +dns_hetzner_api_token = nohnah4zoo9Kiejee9aGh0thoopee2sa diff --git a/root/defaults/index.html b/root/defaults/index.html index 352d1af..5bc81ff 100644 --- a/root/defaults/index.html +++ b/root/defaults/index.html @@ -36,4 +36,4 @@

For help and support, please visit: linuxserver.io/support

- \ No newline at end of file + diff --git a/root/etc/cont-init.d/60-renew b/root/etc/cont-init.d/60-renew index 975c73a..0bc3daa 100644 --- a/root/etc/cont-init.d/60-renew +++ b/root/etc/cont-init.d/60-renew @@ -7,4 +7,4 @@ else echo "The cert is either expired or it expires within the next day. Attempting to renew. This could take up to 10 minutes." /app/le-renew.sh sleep 1 -fi \ No newline at end of file +fi