deb packaging improvements (file locations /var /etc)

Author: sirtoobii

debian/postinst

@@ -14,10 +14,14 @@ chmod g+rwx /etc/wireguard
 chmod -R g+rw /etc/wireguard
 
 # set permissions for /opt/wg-wrangler/etc dir
-chgrp --silent --recursive $GROUPNAME /opt/wg-wrangler/etc
+chgrp --silent --recursive $GROUPNAME /etc/opt/$PKGNAME/
 # set group permissions
-chmod -R g+rwx /opt/wg-wrangler/etc
+chmod -R g+rwx /etc/opt/$PKGNAME/
+
+# create var directory
+mkdir -p /var/opt/$PKGNAME
+chown --silent --recursive $USERNAME /var/opt/$PKGNAME
 
 # Whitelist wg* commands for us
-echo "%$GROUPNAME ALL=NOPASSWD: /usr/bin/wg*" >> /etc/sudoers.d/wg-wrangler
+echo "%$GROUPNAME ALL=NOPASSWD: /usr/bin/wg*" >> /etc/sudoers.d/$PKGNAME
 

debian/rules

@@ -11,7 +11,7 @@ export DH_ALWAYS_EXCLUDE=CVS:.svn:.git:
 
 override_dh_auto_configure:
 	./bootstrap
-	./configure --prefix=/opt/wg-wrangler
+	./configure --prefix=/opt/wg-wrangler --sysconfdir=/etc/opt/wg-wrangler --localstatedir=/var/opt/wg-wrangler
 
 %:
 	dh $@

debian/wg-wrangler.service

@@ -1,14 +1,16 @@
 [Unit]
-Description=wg-wranger wireguard manager
+Description=wg-wrangler wireguard manager
 
 [Service]
-Environment=MOJO_MODE=production
-Environment=MOJO_LOG_LEVEL=info
 Type=simple
 Environment=LISTEN_ON=http://127.0.0.1:7171
 Environment=MOJO_MODE=production
+Environment=MOJO_LOG_LEVEL=info
+Environment=WGwrangler_CONFIG=/etc/opt/wg-wrangler/wgwrangler.yaml
+
 # Environment variables defined in this file (if it exists) override previously defined ones
-EnvironmentFile=opt/wg-wrangler/etc/env.conf
+EnvironmentFile=-/etc/opt/wg-wrangler/env.conf
+
 User=wg-wrangler_manager
 Group=wg-wrangler_manager
 ExecStart=/usr/bin/perl opt/wg-wrangler/bin/wgwrangler.pl prefork --listen $LISTEN_ON

etc/Makefile.am

@@ -1,10 +1,5 @@
 
 
-ETC = wgwrangler.dist.yaml
+ETC = wgwrangler.dist.yaml env.dist.conf
 EXTRA_DIST = $(ETC)
 sysconf_DATA = $(ETC)
-
-wgwrangler.conf:
-	cp wgwrangler.dist.yaml wgwrangler.yaml
-
-.PHONY: wgwrangler.conf

etc/env.dist.conf

@@ -1,2 +1,4 @@
 LISTEN_ON=http://127.0.0.1:7171
 MOJO_MODE=production
+MOJO_LOG_LEVEL=info
+WGwrangler_CONFIG=/etc/opt/wg-wrangler/wgwrangler.yaml

etc/wgwrangler.dist.yaml

@@ -1,6 +1,6 @@
 
 BACKEND:
-  cfg_db: /tmp/wgwrangler.db
+  cfg_db: /var/opt/wg-wrangler/wgwrangler.db
   sesame_user: adfadsfasdf4ee3r
   # perl -MDigest::SHA -e 'print Digest::SHA::hmac_sha1_hex("access"),"\n"'
   sesame_pass: 393afhkjhffjj