2.2

3 files changed, 38 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e80f0edc8f6f..56db306cabd6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gogios-bin
 	pkgdesc = Checks to see if required services are still running on important machines.
-	pkgver = 2.1
+	pkgver = 2.2
 	pkgrel = 1
 	url = https://angrysysadmins.tech
 	install = gogios-bin.install
@@ -10,11 +10,11 @@ pkgbase = gogios-bin
 	optdepends = nmap
 	provides = gogios
 	conflicts = gogios
-	noextract = gogios-2.1.deb
+	noextract = gogios_2.2-1_amd64.deb
 	options = !strip
 	options = !emptydirs
-	source = https://github.com/BKasin/Gogios/releases/download/2.1/gogios-2.1.deb
-	sha256sums = 33bd3bfb2b3ac80a5c8ae14faac41fff909fb4c648899db6b1db02db6f1b7409
+	source = https://github.com/BKasin/Gogios/releases/download/2.2/gogios_2.2-1_amd64.deb
+	sha256sums = b182b942c9bf06a59fa76d86cdb8ae366d94d4dedeb80215506fdcda516f0075
 
 pkgname = gogios-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 6addccf99d2b..a0c6cc21fba2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Bailey Kasin <bailey@gingertechnology.net> (https://angrysysadmins.tech)
 
 pkgname=gogios-bin
-pkgver=2.1
+pkgver=2.2
 pkgrel=1
 pkgdesc="Checks to see if required services are still running on important machines."
 arch=('x86_64')
@@ -11,17 +11,17 @@ optdepends=(
 	'nginx'
 	'nmap'
 )
-source=("https://github.com/BKasin/Gogios/releases/download/${pkgver}/gogios-${pkgver}.deb")
+source=("https://github.com/BKasin/Gogios/releases/download/${pkgver}/gogios_${pkgver}-${pkgrel}_amd64.deb")
 options=('!strip' '!emptydirs')
 install=${pkgname}.install
-noextract=("gogios-${pkgver}.deb")
-sha256sums=('33bd3bfb2b3ac80a5c8ae14faac41fff909fb4c648899db6b1db02db6f1b7409')
+noextract=("gogios_${pkgver}-${pkgrel}_amd64.deb")
+sha256sums=('b182b942c9bf06a59fa76d86cdb8ae366d94d4dedeb80215506fdcda516f0075')
 provides=('gogios')
 conflicts=('gogios')
 
 package() {
-    bsdtar -O -xf gogios-${pkgver}.deb data.tar.xz | bsdtar -C "${pkgdir}" -xJf -
+    bsdtar -O -xf gogios_${pkgver}-${pkgrel}_amd64.deb data.tar.xz | bsdtar -C "${pkgdir}" -xJf -
 
     # Permission fix
     find "${pkgdir}" -type d -exec chmod 755 {} +
-}
\ No newline at end of file
+}
diff --git a/gogios-bin.install b/gogios-bin.install
index 000903746d2c..aa07d8af0bd0 100644
--- a/gogios-bin.install
+++ b/gogios-bin.install
@@ -1,35 +1,37 @@
-post_install() {
-    if [ ! -f /etc/gogios/checks.json ]; then
-        echo "Making default check file"
-        cp /etc/gogios/example.json /etc/gogios/checks.json
+pre_install() {
+    if ! grep "^gogios:" /etc/group &>/dev/null; then
+        groupadd -r gogios
     fi
     
-    if [ ! -f /etc/gogios/gogios.toml ]; then
-        echo "Making default config"
-        cp /etc/gogios/gogios.sample.toml /etc/gogios/gogios.toml
+    if ! id gogios &>/dev/null; then
+        useradd -r -M gogios -s /bin/false -d /var/spool/gogios -g gogios
     fi
+}
 
-    if [ ! -f /opt/gogios/js/current.json ]; then
-	echo "Making current results file"
-	cp /etc/gogios/checks.json /opt/gogios/js/current.json
-    fi
+post_install() {
+    LOG_DIR=/var/log/gogios
+    SCRIPT_DIR=/usr/lib/gogios/scripts
 
-    if [ ! -f /var/log/gogios ]; then
-	mkdir /var/log/gogios
+    test -d $LOG_DIR || mkdir -p $LOG_DIR
+    chown -R -L gogios:gogios $LOG_DIR
+    chmod 755 $LOG_DIR
+
+    cp -f $SCRIPT_DIR/gogios.service /usr/lib/systemd/system/gogios.service
+    systemctl enable gogios || true
+    systemctl daemon-reload || true
+
+    # Add defaults file if it doesn't exist
+    if [[ ! -d /etc/default/gogios ]]; then
+        touch /etc/default/gogios
     fi
     
-    if id "gogios" >/dev/null 2>&1; then
-        echo "gogios user already exists"
-    else
-	mkdir -p /var/spool/gogios
-        useradd --system --user-group --home-dir /var/spool/gogios --shell /sbin/nologin gogios
-	chown gogios:gogios /var/spool/gogios
+    # If the user has no checks yet, give them the example file
+    if [ ! -f /etc/gogios/checks.json ]; then
+        echo "Making default check file"
+        cp /etc/gogios/example.json /etc/gogios/checks.json
     fi
-    
-    chown gogios:gogios -R /var/log/gogios
-    chmod 0764 -R /var/log/gogios
-    chown gogios:gogios -R /usr/lib/gogios
-    chown gogios:gogios -R /etc/gogios
+
+    # Gogios will fail to start if these files aren't owned
     chown gogios:gogios -R /opt/gogios
 }
 
@@ -37,8 +39,8 @@ post_upgrade() {
     post_install
 }
 
-pre_remove() {
-    systemctl stop gogios
+post_remove() {
     systemctl disable gogios
+    rm -f /usr/lib/systemd/system/gogios.service
 }