Merge pull request #148 from linuxserver/fixes

fixes for 2.9.0

Author: aptalca

Dockerfile

@@ -15,21 +15,51 @@ RUN \
  apt-get update && \
  apt-get install -y \
 	bridge-utils \
+	file \
 	gnupg \
 	iproute2 \
 	iptables \
+	libatm1 \
+	libelf1 \
+	libexpat1 \
+	libip4tc0 \
+	libip6tc0 \
+	libiptc0 \
 	liblzo2-2 \
-	libmariadbclient18 \
-	libmysqlclient-dev \
+	libmagic-mgc \
+	libmagic1 \
+	libmariadb3 \
+	libmnl0 \
+	libmpdec2 \
+	libmysqlclient20 \
+	libnetfilter-conntrack3 \
+	libnfnetlink0 \
+	libpcap0.8 \
+	libpython3-stdlib \
+	libpython3.6-minimal \
+	libpython3.6-stdlib \
+	libxtables12 \
+	mime-support \
+	multiarch-support \
+	mysql-common \
 	net-tools \
-	python \
-	python-mysqldb \
-	python-pkg-resources \
-	python-pyrad \
-	python-serial \
-	rsync \
+	python3 \
+	python3-decorator \
+	python3-ldap3 \
+	python3-migrate \
+	python3-minimal \
+	python3-mysqldb \
+	python3-pbr \
+	python3-pkg-resources \
+	python3-pyasn1 \
+	python3-six \
+	python3-sqlalchemy \
+	python3-sqlparse \
+	python3-tempita \
+	python3.6 \
+	python3.6-minimal \
 	sqlite3 \
-	ucarp && \
+	xz-utils && \
  echo "**** add openvpn-as repo ****" && \
  curl -s https://as-repository.openvpn.net/as-repo-public.gpg | apt-key add - && \
  echo "deb http://as-repository.openvpn.net/as/debian bionic main">/etc/apt/sources.list.d/openvpn-as-repo.list && \

README.md

@@ -252,6 +252,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **15.06.20:** - Add fixes for 2.9.0.
 * **04.11.20:** - `xenial` tag is deprecated and there will be no further releases for that tag.
 * **22.06.20:** - Added Support for persistent Customization Folders.
 * **26.03.20:** - Switch to using the openvpn-as repo for packages.

readme-vars.yml

@@ -66,6 +66,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "15.06.20:", desc: "Add fixes for 2.9.0." }
   - { date: "04.11.20:", desc: "`xenial` tag is deprecated and there will be no further releases for that tag." }
   - { date: "22.06.20:", desc: "Added Support for persistent Customization Folders." }
   - { date: "26.03.20:", desc: "Switch to using the openvpn-as repo for packages." }

root/etc/cont-init.d/40-openvpn-init

@@ -1,7 +1,7 @@
 #!/usr/bin/with-contenv bash
 
 NOASCONFIG='DELETE\n'
-ASCONFIG='yes\nyes\n1\n943\n9443\nyes\nyes\nyes\nyes\nno\nadmin\n\n'
+ASCONFIG='yes\nyes\n1\nrsa\n2048\nrsa\n2048\n943\n9443\nyes\nyes\nyes\nyes\nno\nadmin\n\n'
 
 if [ ! -f "/config/etc/as.conf" ]; then
 CONFINPUT=$ASCONFIG