Support for logrotate.

3 files changed, 22 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 354059fa84f9..ca56813a554c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = usermin
 	pkgdesc = A web-based interface for users
 	pkgver = 1.701
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.webmin.com/
 	arch = i686
 	arch = x86_64
@@ -52,13 +52,19 @@ pkgbase = usermin
 	backup = etc/usermin/usermount/config
 	backup = etc/pam.d/usermin
 	source = http://downloads.sourceforge.net/sourceforge/webadmin/usermin-1.701.tar.gz
+	source = setup-pre.sh
+	source = setup-post.sh
 	source = usermin-config.tar.bz2
 	source = usermin.pam
+	source = usermin.logrotate
 	source = usermin.service
 	sha256sums = 93a1be3cee975dd3d4e64d27b09cf252750949eaad7b62f5d5bb88d4edb2da28
+	sha256sums = 366e0315307c89bb0ec10d76c22352de93b92ca556f7f7bb6e34eb1b17d26a9c
+	sha256sums = 17102b3583190f64fae039ca5270ae823cae90ed60fdb2dd49aba95496bff559
 	sha256sums = a05c4d471977282736ac89f4d4d379a91b70678348b1a1b91ce23ebff3c8bfce
 	sha256sums = a979e236681c6a06906937cf0f012e976347af5d6d7e7ae04a11acb01cc2689d
-	sha256sums = ade1b28a8f65512c8878ecabf6c8bc5a2d8ce3fd88dc3bffc1a9e14f3fd1ec47
+	sha256sums = 73b47189419d107e3be2cce131123c73e4d1c954c14f53c223f332da0348681c
+	sha256sums = 6f40dfcd8f1530639b7a8db2cd5401be74d1416ce1116b8f36b0542a85c8d3cf
 
 pkgname = usermin
 
diff --git a/PKGBUILD b/PKGBUILD
index 5f8326432239..a05fe2629dc8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=usermin
 pkgver=1.701
-pkgrel=1
+pkgrel=2
 pkgdesc="A web-based interface for users"
 arch=(i686 x86_64)
 license=('custom:webmin')
@@ -50,6 +50,7 @@ source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.t
         setup-post.sh
         usermin-config.tar.bz2
         usermin.pam
+        usermin.logrotate
         usermin.service)
 options=(!strip !zipman)
 
@@ -63,6 +64,7 @@ prepare() {
     find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*' -exec rm '{}' \+
     echo 'Archlinux	Any version	generic-linux	*	-d "/etc/pacman.d"' > os_list.txt
     cp -rp "$srcdir"/usermin-config/* "$srcdir"/$pkgname-$pkgver/
+    install -m 700 "$srcdir"/setup-{pre,post}.sh "$srcdir"/$pkgname-$pkgver/
 
     # fix setup.sh
     sed -i -e 's:exit 13::g' "$srcdir"/$pkgname-$pkgver/setup.sh
@@ -102,6 +104,7 @@ package() {
     # install sources
     install -D -m 644 "$srcdir"/usermin.service "$pkgdir"/usr/lib/systemd/system/usermin.service
     install -D -m 644 "$srcdir"/usermin.pam "$pkgdir"/etc/pam.d/usermin
+    install -D -m 644 "$srcdir"/usermin.logrotate "$pkgdir"/etc/logrotate.d/usermin
     install -D -m 644 "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/usermin/LICENCE
     mv "$pkgdir"/opt/usermin/user.acl "$pkgdir"/etc/usermin/
 
@@ -115,4 +118,5 @@ sha256sums=('93a1be3cee975dd3d4e64d27b09cf252750949eaad7b62f5d5bb88d4edb2da28'
             '17102b3583190f64fae039ca5270ae823cae90ed60fdb2dd49aba95496bff559'
             'a05c4d471977282736ac89f4d4d379a91b70678348b1a1b91ce23ebff3c8bfce'
             'a979e236681c6a06906937cf0f012e976347af5d6d7e7ae04a11acb01cc2689d'
-            'ade1b28a8f65512c8878ecabf6c8bc5a2d8ce3fd88dc3bffc1a9e14f3fd1ec47')
+            '73b47189419d107e3be2cce131123c73e4d1c954c14f53c223f332da0348681c'
+            '6f40dfcd8f1530639b7a8db2cd5401be74d1416ce1116b8f36b0542a85c8d3cf')
diff --git a/usermin.logrotate b/usermin.logrotate
new file mode 100644
index 000000000000..935a1da09cff
--- /dev/null
+++ b/usermin.logrotate
@@ -0,0 +1,8 @@
+/var/log/usermin/miniserv.error /var/log/usermin/*.log {
+   missingok
+   notifempty
+   sharedscripts
+   postrotate
+      /usr/bin/systemctl reload usermin.service 2>/dev/null || true
+   endscript
+}