[arch-commits] Commit in webmin/trunk (PKGBUILD webmin.rc webmin.service)

[Tobias Powalowski]

    Date: Wednesday, April 25, 2012 @ 09:13:17
  Author: tpowa
Revision: 157189

upgpkg: webmin 1.580-2

fix daemon script and add systemd support

Added:
  webmin/trunk/webmin.service
Modified:
  webmin/trunk/PKGBUILD
  webmin/trunk/webmin.rc

----------------+
 PKGBUILD       |   11 ++++++++---
 webmin.rc      |    6 ++++--
 webmin.service |   11 +++++++++++
 3 files changed, 23 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-25 12:51:06 UTC (rev 157188)
+++ PKGBUILD	2012-04-25 13:13:17 UTC (rev 157189)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=webmin
 pkgver=1.580
-pkgrel=1
+pkgrel=2
 pkgdesc="a web-based interface for system administration"
 arch=(i686 x86_64)
 license=('custom:webmin')
@@ -86,7 +86,8 @@
 source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz 
 	ftp://ftp.archlinux.org/other/webmin/webmin-config.tar.bz2 
 	ftp://ftp.archlinux.org/other/webmin/webmin-pacman.tar.bz2
-	webmin.rc) 
+	webmin.rc
+	webmin.service) 
 options=(!strip)
 
 build() {
@@ -203,6 +204,9 @@
   #install rc file
   install -D -m 755 $startdir/src/webmin.rc $startdir/pkg/etc/rc.d/webmin
 
+  # install systemd files
+  install -D -m 644 $srcdir/webmin.service $pkgdir/usr/lib/systemd/system/webmin.service
+
   # delete temp dir
   rm -r $startdir/pkg/tmp
   # change sticky bit
@@ -213,4 +217,5 @@
 md5sums=('2aa5378bc3ed6471c460d18e87a06fa3'
          '43a77243acd519c4efe9577090b59912'
          'bfebb75bb94029b48c46b7f1ba1aa811'
-         '0673e51af0e81418b4a6c1e205f7e5cd')
+         'c77dfcd621b417a7826d25f56a1e60ae'
+         'fc29ecb6a5cd8c278abe054e60381095')

Modified: webmin.rc
===================================================================
--- webmin.rc	2012-04-25 12:51:06 UTC (rev 157188)
+++ webmin.rc	2012-04-25 13:13:17 UTC (rev 157189)
@@ -14,6 +14,7 @@
      RETVAL=$?
      if [ "$RETVAL" = "0" ]; then
      touch $lockfile >/dev/null 2>&1
+     add_daemon webmin
      stat_done
      else
      stat_fail
@@ -26,6 +27,7 @@
      RETVAL=$?
      if [ "$RETVAL" = "0" ]; then
      rm -f $lockfile
+     rm_daemon webmin
      stat_done
      else
      stat_fail
@@ -33,8 +35,8 @@
 ;;
 
 'restart')
-     $stop && $start
-     RETVAL=$?
+     $0 stop
+     $0 start
 ;;
 *)
 echo "Usage: $0 { start | stop | restart }"

Added: webmin.service
===================================================================
--- webmin.service	                        (rev 0)
+++ webmin.service	2012-04-25 13:13:17 UTC (rev 157189)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Webmin
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/etc/webmin/start
+ExecStop=/etc/webmin/stop
+
+[Install]
+WantedBy=multi-user.target