Fix for goconnect

.gitignore

@@ -5,6 +5,7 @@ data_import/
 *.py[cod]
 production.conf
 credentialsrc
+release/
 
 # C extensions
 .#*

build.sh

@@ -39,16 +39,16 @@ cp $DIR/contrib/yumrepo.repo $RELEASEDIR/rpm/ovpm.repo
 cp $DIR/contrib/deb-repo-config $RELEASEDIR/deb/conf/distributions
 
 #package
-fpm -s dir -t rpm -n ovpm --version $VERSION  --iteration $RELEASEVER --depends openvpn --description "OVPM makes all aspects of OpenVPN server administration a breeze." --before-install $DIR/contrib/beforeinstall.sh --after-install $DIR/contrib/afterinstall.sh --before-remove $DIR/contrib/beforeremove.sh --after-upgrade $DIR/contrib/afterupgrade.sh -p $RELEASEDIR/rpm -C $RELEASEDIR/build .
+# fpm -s dir -t rpm -n ovpm --version $VERSION  --iteration $RELEASEVER --depends openvpn --description "OVPM makes all aspects of OpenVPN server administration a breeze." --before-install $DIR/contrib/beforeinstall.sh --after-install $DIR/contrib/afterinstall.sh --before-remove $DIR/contrib/beforeremove.sh --after-upgrade $DIR/contrib/afterupgrade.sh -p $RELEASEDIR/rpm -C $RELEASEDIR/build .
 
 fpm -s dir -t deb -n ovpm --version $VERSION --iteration $RELEASEVER --depends openvpn --description "OVPM makes all aspects of OpenVPN server administration a breeze." --before-install $DIR/contrib/beforeinstall.sh --after-install $DIR/contrib/afterinstall.sh --before-remove $DIR/contrib/beforeremove.sh --after-upgrade $DIR/contrib/afterupgrade.sh -p $RELEASEDIR/deb -C $RELEASEDIR/build .
 
 #create rpm repo
-createrepo --database $RELEASEDIR/rpm
+# createrepo --database $RELEASEDIR/rpm
 
 #create deb repo
 reprepro -b $RELEASEDIR/deb/ includedeb ovpm $RELEASEDIR/deb/*.deb
 
 # clean
-rm -rf $RELEASEDIR/build
+# rm -rf $RELEASEDIR/build
 echo "packages are ready at ./deb/ and ./rpm/"

build_local.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+export RELEASEDIR=./release
+export DIR=.
+
+./build.sh

contrib/afterinstall.sh

@@ -4,4 +4,5 @@ export GROUP="nogroup"
 id -u $USER &>/dev/null || useradd $USER
 id -g $GROUP &>/dev/null || groupadd $GROUP
 
-systemctl daemon-reload
+# Disable systemctl for running in docker
+# systemctl daemon-reload

contrib/afterupgrade.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
-systemctl daemon-reload
-if [ "`systemctl is-active ovpmd`" != "active" ]
-then
-    systemctl restart ovpmd
-fi
+# Disable systemctl for running in docker
+# systemctl daemon-reload
+# if [ "`systemctl is-active ovpmd`" != "active" ]
+# then
+#    systemctl restart ovpmd
+# fi

contrib/beforeremove.sh

@@ -1,3 +1,4 @@
 #!/bin/bash
-systemctl stop ovpmd
-systemctl disable ovpmd
+# Disable systemctl for running in docker
+# systemctl stop ovpmd
+# systemctl disable ovpmd

template/ccd.file.tmpl

@@ -1,4 +1,4 @@
-ifconfig-push {{ .IP }} {{ .NetMask }}
+;ifconfig-push {{ .IP }} {{ .NetMask }}
 
 {{if .RedirectGW }}
 push "redirect-gateway def1 bypass-dhcp"
@@ -12,3 +12,5 @@ push "route {{index . 0}} {{index . 1}}"
 {{range .Routes}}
 push "route {{index . 0}} {{index . 1}} {{index . 2}}"
 {{ end }}
+
+iroute 192.168.1.0 255.255.255.0

template/server.conf.tmpl

@@ -203,7 +203,7 @@ client-to-client
 # CERTIFICATE/KEY PAIRS FOR EACH CLIENT,
 # EACH HAVING ITS OWN UNIQUE "COMMON NAME",
 # UNCOMMENT THIS LINE OUT.
-;duplicate-cn
+duplicate-cn
 
 # The keepalive directive causes ping-like
 # messages to be sent back and forth over