From 7de30d8ff4b981946a3bdbfae7d1162f39caa15e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 27 Jan 2015 19:33:19 +0000
Subject: webmin: update to 1.730

add nofork=1 to miniserv.conf for runit

change some mysql module configs
---
 abs/extra/webmin/PKGBUILD       | 13 +++++++++++--
 abs/extra/webmin/__changelog    |  4 +++-
 abs/extra/webmin/webmin.install |  1 -
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/abs/extra/webmin/PKGBUILD b/abs/extra/webmin/PKGBUILD
index 5e0da7e..edce250 100644
--- a/abs/extra/webmin/PKGBUILD
+++ b/abs/extra/webmin/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=webmin
-pkgver=1.700
+pkgver=1.730
 pkgrel=1
 pkgdesc="a web-based interface for system administration"
 arch=(i686 x86_64)
@@ -196,6 +196,15 @@ package() {
   # make it only accessible by localhost
   echo 'allow=127.0.0.1 192.168. 172.16. 10.' >> "$pkgdir"/etc/webmin/miniserv.conf
 
+  # add don't fork so runit can manage it
+  echo 'nofork=1' >> "$pkgdir"/etc/webmin/miniserv.conf
+
+  # change mysql start stop cmds
+  sed -i -e 's:start_cmd=/etc/rc.d/mysqld start:start_cmd=/usr/bin/sv start mysql:g' \
+         -e 's:pass=foo:pass=mythtv:g' -e 's:login=root:login=mythtv:g' \
+         -e 's:stop_cmd=/etc/rc.d/mysqld stop:stop_cmd=/usr/bin/sv stop mysql:g' \
+         "$pkgdir"/etc/webmin/mysql/config
+
   # install pacman menu
   cd "$srcdir"/webmin-pacman/config
   cp -rfp * "$pkgdir"/etc/webmin/pacman
@@ -210,7 +219,7 @@ package() {
   # install license
   install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE
 }
-md5sums=('e5261114a6a6ed10caf570d3239ed5b7'
+md5sums=('a54d11c32372b8361da1ad363a2d3ad9'
          'b0b3e3fb231a12e60165b6b4d604dcfa'
          'bfebb75bb94029b48c46b7f1ba1aa811'
          'fc29ecb6a5cd8c278abe054e60381095')
diff --git a/abs/extra/webmin/__changelog b/abs/extra/webmin/__changelog
index 9f14075..741481a 100644
--- a/abs/extra/webmin/__changelog
+++ b/abs/extra/webmin/__changelog
@@ -1,2 +1,4 @@
-PKGBUILD: Added private networks
+PKGBUILD: Added private networks to miniserv.conf
+PKGBUILD: Added nofork=1 to miniserv.conf
 PKGBUILD: Change OS name to LinHES
+PKGBUILD: Change mysql start and stop and login and pass in mysql/config
diff --git a/abs/extra/webmin/webmin.install b/abs/extra/webmin/webmin.install
index efdd929..fc9fd44 100644
--- a/abs/extra/webmin/webmin.install
+++ b/abs/extra/webmin/webmin.install
@@ -10,7 +10,6 @@ Note:
 ==> It is not allowed to install 3rd party modules, or delete existing modules.
 ==> Please write your own PKGBUILDS for 3rd party modules and additional themes.
 Setup:
-==> To make webmin start at boot time, add webmin to rc.conf daemons
 ==> Point your web browser to http://localhost:10000 to use webmin.
 ==> The access is restricted to localhost, if you want to connect from other locations
 ==> change /etc/webmin/miniserv.conf to something like that: allow=127.0.0.1 <your-ip>
-- 
cgit v0.12