Changeset 031ab69 for npl/internetserver

Timestamp:

02/28/18 18:24:39 (7 years ago)

Author:

Edwin Eefting <edwin@datux.nl>

Branches:

master, perl-5.22

Children:

669bb09

Parents:

df958d5 (diff), 90f43e5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'gcc484'

Location:

npl/internetserver

Files:

• openvpn/openvpn-2.3.18.tar.gz (added)
• openvpn/openvpn.SlackBuild (modified) (1 diff)
• openvpn/openvpn.SlackBuild.log.gz (modified) (previous)
• openvpn/openvpn.md5 (modified) (1 diff)
• openvpn/openvpn.pkg (modified) (previous)
• openvpn/openvpn.version (modified) (1 diff)
• openvpn/openvpn_dev.pkg (modified) (previous)
• openvpn/openvpn_dev.version (modified) (1 diff)
• openvpn_conf/openvpn_conf.SlackBuild.log.gz (modified) (previous)
• openvpn_conf/openvpn_conf.build (modified) (1 diff)
• openvpn_conf/openvpn_conf.md5 (modified) (2 diffs)
• openvpn_conf/openvpn_conf.pkg (modified) (previous)
• openvpn_conf/root/etc/postinst.d/post.openvpn (deleted)
• openvpn_conf/root/service/openvpn/run (modified) (1 diff)

npl/internetserver/openvpn/openvpn.SlackBuild

@@ -53 +53 @@
 #export CFLAGS="-fgnu89-inline" #If "multiple definition of `foo'" Also see http://gcc.gnu.org/gcc-4.3/porting_to.html
 MAKE_OPTS=""
+autoreconf -i -v -f || exit 1
 ./configure --prefix=/usr  || exit 1
 

npl/internetserver/openvpn/openvpn.md5

@@ -1 @@
-5797885e15c48fd9ef1c7fde7552aed5  ./openvpn-2.3.14.tar.gz
-9ec4d9ce81c6f57d2c8449fbb8c3323f  ./openvpn_dev.pkg
-dacffff2e31b9a9fc600a736867012f2  ./openvpn.pkg
-259216217a81affa926a650cc3172990  ./openvpn.SlackBuild
-f9e389fe29cae0015c8b78fcad305b4c  ./openvpn.SlackBuild.log.gz
+9fe8ad5ac2f5f5b8feb7828a8edd1aec  ./openvpn-2.3.18.tar.gz
+af2b55ef539039c7abc0bb9c6602d565  ./openvpn_dev.pkg
+3224fc56ba75c502947bf48e8752982d  ./openvpn.pkg
+3a5786293ac155e67653e52e9f428df1  ./openvpn.SlackBuild
+563195c2aad60e1f29fce0fed417816c  ./openvpn.SlackBuild.log.gz

npl/internetserver/openvpn/openvpn.version

@@ -1 @@
-2.3.14
+2.3.18

npl/internetserver/openvpn/openvpn_dev.version

@@ -1 @@
-2.3.14
+2.3.18

npl/internetserver/openvpn_conf/openvpn_conf.build

@@ -1 @@
-6558
+6560

npl/internetserver/openvpn_conf/openvpn_conf.md5

@@ -1 @@
-e6b8830262387e5096021399e73eacfe  ./openvpn_conf.pkg
+c944c634d7d393d656a8bc72981d857d  ./openvpn_conf.pkg
 729b418d4c2197708760319d4097906e  ./openvpn_conf.SlackBuild
-30b7d6e39f812d1cca79c92ee2d8f014  ./openvpn_conf.SlackBuild.log.gz
+9642ef78f7a58f409156e4e23271ae51  ./openvpn_conf.SlackBuild.log.gz
 02590f2d27b9254da5877e03719a9228  ./root/etc/firewall/services.openvpn
 5d08314120a94191e539c792b1c410a2  ./root/etc/openvpn/easyrsa
@@ -18 +18 @@
 d0d7a06379af67505bf5dae59d3e7afb  ./root/etc/openvpn/x509-types/server
 c8fadda104656594f3ceadbb13d9d178  ./root/etc/pam.d/openvpn
-0b5c1be62a06a25f07bb7360014c82e7  ./root/etc/postinst.d/post.openvpn
-b4cd1c6ab389a60ed98da6d792339fa7  ./root/service/openvpn/run
+a6e8a68a743fe6448c01ccba1db33569  ./root/service/openvpn/run

npl/internetserver/openvpn_conf/root/service/openvpn/run

@@ -1 +1 @@
 #!/bin/bash
+
+set -e
+
+cd /etc/openvpn
+
+# key generation moved here, otherwise it takes too long (now the system is generating more entrophy because it continues to start)
+
+
+#basic setup
+if ! [ -e pki ]; then
+        ./easyrsa init-pki
+fi
+
+#create ca cert
+if ! [ -e pki/ca.crt ]; then
+        echo syn3 | ./easyrsa build-ca nopass
+fi
+
+#create server cert
+if ! [ -e pki/issued/server.crt ]; then
+        ./easyrsa build-server-full server nopass
+fi
+
+#create dh parameters
+if ! [ -e pki/dh.pem ]; then
+        ./easyrsa gen-dh
+fi
+
+#create CRL list
+if ! [ -e pki/crl.pem ]; then
+        ./easyrsa gen-crl
+fi
+
+#openvpn group
+if ! ( getent group | grep "OpenVPN access" &> /dev/null ) ; then
+ smbldap-groupadd -g 521 "OpenVPN access" || exit 1;
+fi
+
+#openvpn ipblock
+NAME="OpenVPN clients"
+if ! grep "$NAME" /etc/firewall/ipblocks; then
+        echo "$NAME='10.8.0.0/24'" >> /etc/firewall/ipblocks
+fi
+
+#create tlsauth key
+if ! [ -e pki/ta.key ]; then
+        openvpn --genkey --secret pki/ta.key
+fi
+
 
 modprobe tun
 
-cd /etc/openvpn
 exec openvpn --config openvpn.conf --config openvpn_syn3.conf  --config openvpn_custom.conf