Adding viper and go-logging and solve some bugs

5 files changed, 74 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e986b60f68ab..c36d80a7dce3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
 pkgbase = sshd_autoban
 	pkgdesc = A ssh autoban for fast and slow brute force attack
-	pkgver = 0.3
-	pkgrel = 5
+	pkgver = 0.0.4
+	pkgrel = 1
 	url = https://github.com/Chipsterjulien/go-sshd_autoban
 	install = sshd_autoban.install
 	arch = any
 	license = WTFPL
 	makedepends = go
 	options = !strip
-	options = !emptydirs
 	backup = etc/sshd_autoban/sshd_autoban.json
-	source = sshd_autoban-0.3.tar.gz
-	sha256sums = 0c26a63db2985ff65f52e3dde178a947ceab0a5f5c99bc18948616c630146e10
+	source = sshd_autoban-0.0.4.tar.gz
+	sha512sums = c6c8a447636d629cb62e246b8a26ee03aca96a198b9fa533fc6048793ceace94ecfd21d4f525e60b6c733ba977dafec2fa92c96510b5c2d4b62a1b0bed8c20e0
 
 pkgname = sshd_autoban
 
diff --git a/PKGBUILD b/PKGBUILD
index be2612113b22..955a98edcf13 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,64 @@
 # Maintainer: Chipster Julien <julien dot chipster @ archlinux dot fr>
 
 pkgname=sshd_autoban
-pkgver=0.3
-pkgrel=5
+pkgver=0.0.4
+pkgrel=1
 pkgdesc="A ssh autoban for fast and slow brute force attack"
 arch=('any')
 url="https://github.com/Chipsterjulien/go-sshd_autoban"
 license=('WTFPL')
 makedepends=('go')
-options=('!strip' '!emptydirs')
+options=('!strip')
 backup=('etc/sshd_autoban/sshd_autoban.json')
 source=("$pkgname-$pkgver.tar.gz")
 install=sshd_autoban.install
-sha256sums=('0c26a63db2985ff65f52e3dde178a947ceab0a5f5c99bc18948616c630146e10')
+
+_builddir="$pkgname-$pkgver"
 
 build() {
-  cd "$pkgname-$pkgver"
+    GOPATH_exist=1
+    if [ -z $GOPATH ]; then
+        # path don't exit
+        GOPATH_exist=0
+
+        # create gopath directory
+        mkdir -p .gopath/{bin,src}
+        # export var
+        export GOPATH=~/.gopath
+    fi
+
+    # Getting some libs
+    go get github.com/op/go-logging
+    go get github.com/spf13/viper
+
+    cd "$_builddir"
+
+    go build || return 1
 
-  go build
+    if [ $GOPATH_exist == 0 ]; then
+        rm -rf ~/.gopath
+        export GOPATH=
+    fi
 }
 
 package() {
-  cd "$pkgname-$pkgver"
-  	
-	# Create directory and copy files
-	install -Dm644 "cfg/sshd_autoban.json" "$pkgdir/etc/sshd_autoban/sshd_autoban.json"
-	install -Dm644 "cfg/sshd_autoban.service" "$pkgdir/usr/lib/systemd/system/sshd_autoban.service"
-	install -Dm644 "cfg/errors.log" "$pkgdir/var/log/sshd_autoban/errors.log"
-  
-  # install -Dm755 "$pkgname-$pkgver" "$pkgdir/usr/bin/$pkgname"
-  # install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  
-  install -Dm755 "$pkgname-$pkgver" "$pkgdir/usr/bin/sshd_autoban"
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/sshd_autoban/LICENSE"
+    cd "$_builddir"
+
+    # sshd_autoban.toml
+    install -Dm644 cfg/"$pkgname"_sample.toml \
+        "$pkgdir"/etc/$pkgname/"$pkgname"_sample.toml || return 1
+
+    # Create log directory
+    install -dm755 "$pkgdir"/var/log/$pkgname || return 1
+
+    # sshd_autoban.service
+    install -Dm644 cfg/"$pkgname".service \
+        "$pkgdir"/usr/lib/systemd/system/"$pkgname".service || return 1
+
+    # sshd_autoban binary
+    install -m755 -o root -g root -D "$srcdir"/$pkgname-$pkgver/$pkgname-$pkgver \
+        "$pkgdir"/usr/bin/$pkgname || return 1
 }
 
-# vim:set ts=2 sw=2 et:
+
+sha512sums=('c6c8a447636d629cb62e246b8a26ee03aca96a198b9fa533fc6048793ceace94ecfd21d4f525e60b6c733ba977dafec2fa92c96510b5c2d4b62a1b0bed8c20e0')
diff --git a/sshd_autoban-0.0.4.tar.gz b/sshd_autoban-0.0.4.tar.gz
new file mode 100644
index 000000000000..56979e4565a8
--- /dev/null
+++ b/sshd_autoban-0.0.4.tar.gz
diff --git a/sshd_autoban-0.3.tar.gz b/sshd_autoban-0.3.tar.gz
deleted file mode 100644
index e02c2ab62b5b..000000000000
--- a/sshd_autoban-0.3.tar.gz
+++ /dev/null
diff --git a/sshd_autoban.install b/sshd_autoban.install
index cc2b97d8b485..6d39a82cc646 100644
--- a/sshd_autoban.install
+++ b/sshd_autoban.install
@@ -1,32 +1,38 @@
 post_install() {
-	echo
-	echo "Becareful, you must edit /etc/sshd_autoban/sshd_autoban.json"
-	echo
+    pkgname=sshd_autoban
 
-	# Create directories
+    # Fixing membership
+    chown root: /var/log/$pkgname
+    chown -R root: /etc/$pkgname
 
-	# mkdir -p "$pkgdir/var/log/sshd_autoban/"
+    # Reload systemctl
+    systemctl daemon-reload
 
-	# Fixing right
+    echo "Adding sshd_autoban in systemctl:"
+    echo "  systemctl enable sshd_autoban"
+    echo "  systemctl start sshd_autoban"
 
-	chmod 644 "$pkgdir/etc/sshd_autoban/sshd_autoban.json"
-	chmod 755 "$pkgdir/var/log/sshd_autoban"
-	chmod 755 "$pkgdir/var/log/sshd_autoban/errors.log"
-	chmod 755 "$pkgdir/usr/bin/sshd_autoban"
+    true
+}
 
-	# Fixing membership
+post_upgrade() {
+    # Reload systemctl
+    systemctl daemon-reload
 
-	chown -R root: "/var/log/sshd_autoban"
-	chown root: "/etc/sshd_autoban/sshd_autoban.json"
+    echo "You should restart sshd_autoban:"
+    echo "  systemctl restart sshd_autoban"
 
-	true
+    true
 }
 
-post_upgrade() {
-    echo "Reload systemctl"
+pre_remove() {
+    pkgname=sshd_autoban
+    # Remove symlink in systemd
+    systemctl disable $pkgname
+    # Stop server
+    systemctl stop $pkgname
+    # Reload systemctl
     systemctl daemon-reload
-}
 
-post_remove() {
-	true
+    true
 }