Skip to content
This repository was archived by the owner on Jan 6, 2021. It is now read-only.

Commit 94d4621

Browse files
aptalcaaptalca
authored
Merge branch 'master' into authelia
2 parents 20670c0 + a04148c commit 94d4621

File tree

8 files changed

+83
-59
lines changed

8 files changed

+83
-59
lines changed

‎Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ RUN \
6767
php7-pdo_sqlite \
6868
php7-pear \
6969
php7-pecl-apcu \
70-
php7-pecl-imagick \
7170
php7-pecl-redis \
7271
php7-pgsql \
7372
php7-phar \

‎Dockerfile.aarch64‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ RUN \
6767
php7-pdo_sqlite \
6868
php7-pear \
6969
php7-pecl-apcu \
70-
php7-pecl-imagick \
7170
php7-pecl-redis \
7271
php7-pgsql \
7372
php7-phar \

‎Dockerfile.armhf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ RUN \
6767
php7-pdo_sqlite \
6868
php7-pear \
6969
php7-pecl-apcu \
70-
php7-pecl-imagick \
7170
php7-pecl-redis \
7271
php7-pgsql \
7372
php7-phar \

‎package_versions.txt‎

Lines changed: 47 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ curl-7.67.0-r0
1515
db-5.3.28-r1
1616
expat-2.2.9-r1
1717
fail2ban-0.10.4-r2
18-
fontconfig-2.13.1-r2
1918
freetype-2.10.1-r0
2019
gdbm-1.13-r1
2120
git-2.24.3-r0
@@ -25,10 +24,8 @@ gmp-6.1.2-r1
2524
gnupg-2.2.19-r0
2625
gnutls-3.6.10-r1
2726
icu-libs-64.2-r1
28-
imagemagick-libs-7.0.9.7-r0
2927
ip6tables-1.8.3-r2
3028
iptables-1.8.3-r2
31-
lcms2-2.9-r1
3229
libacl-2.2.53-r0
3330
libassuan-2.5.3-r0
3431
libattr-2.4.48-r0
@@ -51,10 +48,9 @@ libidn-1.35-r0
5148
libintl-0.20.1-r2
5249
libjpeg-turbo-2.0.4-r0
5350
libksba-1.3.5-r0
54-
libldap-2.4.48-r1
55-
libltdl-2.4.6-r7
51+
libldap-2.4.48-r2
5652
libmagic-5.37-r1
57-
libmaxminddb-1.4.2-r0
53+
libmaxminddb-1.4.2-r1
5854
libmcrypt-2.5.8-r7
5955
libmemcached-libs-1.0.18-r4
6056
libmnl-1.0.4-r0
@@ -125,55 +121,54 @@ pcre2-10.34-r1
125121
perl-5.30.1-r0
126122
perl-error-0.17028-r0
127123
perl-git-2.24.3-r0
128-
php7-7.3.17-r0
129-
php7-bcmath-7.3.17-r0
130-
php7-bz2-7.3.17-r0
131-
php7-common-7.3.17-r0
132-
php7-ctype-7.3.17-r0
133-
php7-curl-7.3.17-r0
134-
php7-dom-7.3.17-r0
135-
php7-exif-7.3.17-r0
136-
php7-fileinfo-7.3.17-r0
137-
php7-fpm-7.3.17-r0
138-
php7-ftp-7.3.17-r0
139-
php7-gd-7.3.17-r0
140-
php7-iconv-7.3.17-r0
141-
php7-imap-7.3.17-r0
142-
php7-intl-7.3.17-r0
143-
php7-json-7.3.17-r0
144-
php7-ldap-7.3.17-r0
145-
php7-mbstring-7.3.17-r0
146-
php7-mysqli-7.3.17-r0
147-
php7-mysqlnd-7.3.17-r0
148-
php7-opcache-7.3.17-r0
149-
php7-openssl-7.3.17-r0
150-
php7-pdo-7.3.17-r0
151-
php7-pdo_mysql-7.3.17-r0
152-
php7-pdo_odbc-7.3.17-r0
153-
php7-pdo_pgsql-7.3.17-r0
154-
php7-pdo_sqlite-7.3.17-r0
155-
php7-pear-7.3.17-r0
124+
php7-7.3.18-r0
125+
php7-bcmath-7.3.18-r0
126+
php7-bz2-7.3.18-r0
127+
php7-common-7.3.18-r0
128+
php7-ctype-7.3.18-r0
129+
php7-curl-7.3.18-r0
130+
php7-dom-7.3.18-r0
131+
php7-exif-7.3.18-r0
132+
php7-fileinfo-7.3.18-r0
133+
php7-fpm-7.3.18-r0
134+
php7-ftp-7.3.18-r0
135+
php7-gd-7.3.18-r0
136+
php7-iconv-7.3.18-r0
137+
php7-imap-7.3.18-r0
138+
php7-intl-7.3.18-r0
139+
php7-json-7.3.18-r0
140+
php7-ldap-7.3.18-r0
141+
php7-mbstring-7.3.18-r0
142+
php7-mysqli-7.3.18-r0
143+
php7-mysqlnd-7.3.18-r0
144+
php7-opcache-7.3.18-r0
145+
php7-openssl-7.3.18-r0
146+
php7-pdo-7.3.18-r0
147+
php7-pdo_mysql-7.3.18-r0
148+
php7-pdo_odbc-7.3.18-r0
149+
php7-pdo_pgsql-7.3.18-r0
150+
php7-pdo_sqlite-7.3.18-r0
151+
php7-pear-7.3.18-r0
156152
php7-pecl-apcu-5.1.18-r0
157153
php7-pecl-igbinary-3.0.1-r1
158-
php7-pecl-imagick-3.4.4-r2
159154
php7-pecl-mcrypt-1.0.3-r0
160155
php7-pecl-memcached-3.1.5-r0
161156
php7-pecl-redis-5.1.1-r0
162-
php7-pgsql-7.3.17-r0
163-
php7-phar-7.3.17-r0
164-
php7-posix-7.3.17-r0
165-
php7-session-7.3.17-r0
166-
php7-simplexml-7.3.17-r0
167-
php7-soap-7.3.17-r0
168-
php7-sockets-7.3.17-r0
169-
php7-sodium-7.3.17-r0
170-
php7-sqlite3-7.3.17-r0
171-
php7-tokenizer-7.3.17-r0
172-
php7-xml-7.3.17-r0
173-
php7-xmlreader-7.3.17-r0
174-
php7-xmlrpc-7.3.17-r0
175-
php7-xmlwriter-7.3.17-r0
176-
php7-zip-7.3.17-r0
157+
php7-pgsql-7.3.18-r0
158+
php7-phar-7.3.18-r0
159+
php7-posix-7.3.18-r0
160+
php7-session-7.3.18-r0
161+
php7-simplexml-7.3.18-r0
162+
php7-soap-7.3.18-r0
163+
php7-sockets-7.3.18-r0
164+
php7-sodium-7.3.18-r0
165+
php7-sqlite3-7.3.18-r0
166+
php7-tokenizer-7.3.18-r0
167+
php7-xml-7.3.18-r0
168+
php7-xmlreader-7.3.18-r0
169+
php7-xmlrpc-7.3.18-r0
170+
php7-xmlwriter-7.3.18-r0
171+
php7-zip-7.3.18-r0
177172
pinentry-1.1.0-r2
178173
popt-1.16-r7
179174
py3-asn1crypto-1.2.0-r1
@@ -187,9 +182,9 @@ python3-3.8.2-r0
187182
readline-8.0.1-r0
188183
scanelf-1.2.4-r0
189184
shadow-4.7-r1
190-
sqlite-libs-3.30.1-r1
185+
sqlite-libs-3.30.1-r2
191186
ssl_client-1.31.1-r9
192-
tzdata-2019c-r0
187+
tzdata-2020a-r0
193188
unixodbc-2.3.7-r2
194189
whois-5.5.3-r0
195190
xz-5.2.4-r0

‎root/defaults/fail2ban/filter.d/nginx-deny.conf‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# fail2ban filter configuration for nginx
2+
3+
4+
[Definition]
5+
6+
7+
failregex = ^ \[error\] \d+#\d+: \*\d+ (access forbidden by rule), client: <HOST>, server: \S*, request: "\S+ \S+ HTTP\/\d+\.\d+", host: "\S+"(?:, referrer: "\S+")?\s*$
8+
9+
ignoreregex =
10+
11+
datepattern = {^LN-BEG}
12+
13+
# DEV NOTES:
14+
#
15+
# Author: Will L ([email protected])

‎root/defaults/jail.local‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Version 2020/05/05 - Changelog: https://github.com/linuxserver/docker-letsencrypt/commits/master/root/defaults/jail.local
1+
## Version 2020/05/10 - Changelog: https://github.com/linuxserver/docker-letsencrypt/commits/master/root/defaults/jail.local
22
# This is the custom version of the jail.conf for fail2ban
33
# Feel free to modify this and add additional filters
44
# Then you can drop the new filter conf files into the fail2ban-filters
@@ -48,3 +48,10 @@ enabled = true
4848
port = http,https
4949
filter = nginx-botsearch
5050
logpath = /config/log/nginx/access.log
51+
52+
[nginx-deny]
53+
54+
enabled = true
55+
port = http,https
56+
filter = nginx-deny
57+
logpath = /config/log/nginx/error.log

‎root/defaults/ldap.conf‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## Version 2020/03/13 - Changelog: https://github.com/linuxserver/docker-letsencrypt/commits/master/root/defaults/ldap.conf
2-
## this conf is meant to be used in conjuntction with our ldap-auth image: https://github.com/linuxserver/docker-ldap-auth
2+
## this conf is meant to be used in conjunction with our ldap-auth image: https://github.com/linuxserver/docker-ldap-auth
33
## see the heimdall example in the default site config for info on enabling ldap auth
44
## for further instructions on this conf, see https://github.com/nginxinc/nginx-ldap-auth
55

@@ -62,6 +62,7 @@
6262

6363
# (Required) Set the Bind DN, by replacing the value enclosed in
6464
# double quotes.
65+
# If AD, use "[email protected]"
6566
proxy_set_header X-Ldap-BindDN "cn=root,dc=test,dc=local";
6667

6768
# (Required) Set the Bind password, by replacing 'secret'.

‎root/etc/cont-init.d/50-config‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,17 @@ fi
278278
[[ ! -d /var/lib/libmaxminddb ]] && \
279279
ln -s /config/geoip2db /var/lib/libmaxminddb
280280
# check GeoIP2 database
281-
[[ ! -f /var/lib/libmaxminddb/GeoLite2-City.mmdb ]] && \
282-
echo "Starting 2019/12/30, GeoIP2 databases require personal license key to download. Please manually download/update the GeoIP2 db and save as /config/geoip2db/GeoLite2-City.mmdb"
281+
if [ -n "$MAXMINDDB_LICENSE_KEY" ]; then
282+
sed -i "s|.*MAXMINDDB_LICENSE_KEY.*|MAXMINDDB_LICENSE_KEY=\"${MAXMINDDB_LICENSE_KEY}\"|g" /etc/conf.d/libmaxminddb
283+
if [ ! -f /var/lib/libmaxminddb/GeoLite2-City.mmdb ]; then
284+
echo "Downloading GeoIP2 City database."
285+
/etc/periodic/weekly/libmaxminddb
286+
fi
287+
elif [ -f /var/lib/libmaxminddb/GeoLite2-City.mmdb ]; then
288+
echo -e "Currently using the user provided GeoLite2-City.mmdb.\nIf you want to enable weekly auto-updates of the database, retrieve a free license key from MaxMind,\nand add a new env variable \"MAXMINDDB_LICENSE_KEY\", set to your license key."
289+
else
290+
echo -e "Starting 2019/12/30, GeoIP2 databases require personal license key to download. Please retrieve a free license key from MaxMind,\nand add a new env variable \"MAXMINDDB_LICENSE_KEY\", set to your license key."
291+
fi
283292

284293
# logfiles needed by fail2ban
285294
[[ ! -f /config/log/nginx/error.log ]] && \

0 commit comments

Comments
 (0)