summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2014-06-07 11:29:36 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2014-06-07 11:29:36 +0000
commit23a8b2ceb3c7afd81d7d5c1f3a68dd4ae88f9240 (patch)
tree442261192435bb3631280e8658c2bacd3a149916 /app-admin/webmin
parentRemove redundant NEED_EMACS assignment. (diff)
downloadhistorical-23a8b2ceb3c7afd81d7d5c1f3a68dd4ae88f9240.tar.gz
historical-23a8b2ceb3c7afd81d7d5c1f3a68dd4ae88f9240.tar.bz2
historical-23a8b2ceb3c7afd81d7d5c1f3a68dd4ae88f9240.zip
Version bump. Fixes bug #511624 thanks to PhobosK <phobosk@fastmail.fm> and Pacho Ramos <pacho@gentoo.org>
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0x09BF4F54C2BA7F3C!
Diffstat (limited to 'app-admin/webmin')
-rw-r--r--app-admin/webmin/ChangeLog10
-rw-r--r--app-admin/webmin/Manifest41
-rwxr-xr-xapp-admin/webmin/files/gentoo-setup27
-rw-r--r--app-admin/webmin/files/init.d.webmin9
-rw-r--r--app-admin/webmin/files/webmin.service18
-rw-r--r--app-admin/webmin/webmin-1.690.ebuild (renamed from app-admin/webmin/webmin-1.680.ebuild)57
6 files changed, 119 insertions, 43 deletions
diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 581eda395771..b3fc2f4b49af 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for app-admin/webmin
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.206 2014/05/01 16:30:09 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.207 2014/06/07 11:29:32 hwoarang Exp $
+
+*webmin-1.690 (07 Jun 2014)
+
+ 07 Jun 2014; Markos Chandras <hwoarang@gentoo.org> +files/webmin.service,
+ +webmin-1.690.ebuild, -webmin-1.680.ebuild, files/gentoo-setup,
+ files/init.d.webmin:
+ Version bump. Fixes bug #511624 thanks to PhobosK <phobosk@fastmail.fm> and
+ Pacho Ramos <pacho@gentoo.org>
*webmin-1.680 (01 May 2014)
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index 5d76c7eac8ac..1bd1262acc6e 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,29 +1,30 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX gentoo-setup 11549 SHA256 1468c8641cd292006e2dc70bb656db8cf0bb858f79c50a39f605072c520cf7a4 SHA512 3ae80ff0dd7a4fd10c0fcc26521d7dcf3b2ca26e87d6282b5272dca855563992fa97ff3c2d1bc721e69449e45ba779f81eff5bd0ccb6e80f6d5a8d64a3d8e74e WHIRLPOOL b60a1f317dbfbf297097d3bc5598867c127e62ac410819c5d60062650326b57fe407c6181eaee0a8c1c7d4c45cb6f08b3546f87d9524d0ef2f384f868a546a9e
-AUX init.d.webmin 2254 SHA256 c596712f1dffd69a618055372a39245ecf732a3bbcfadf6c26c9d03640af3547 SHA512 13b28390220a2b653cfdea347b0164e307f8ee6fbe3fff70b12c771829d31b32617f876faab1942f35ca9c46dceb7fcb26d199beccabd683ebe774b69c375d25 WHIRLPOOL 1c5067dc113a692ef68e15a890e325c61ab9e356cc7d43a586afa778eb0708c9cafac219e5766301a284da8998a48e31e600c4cc23d8c7b4ae524888def4db36
-DIST webmin-1.680-minimal.tar.gz 2593231 SHA256 8152e56f9f880b1f719134a877b2bb2b022fccdd59a875aefbf6f24b0cb37230 SHA512 742238771bcff5342b2c651a015ba234d66035fdbab900963a9cf0832aa13ea299d565a6467a737e59b6b69b8a6a50fa8a5545f6cb615b0fcdcf0b2942eb5213 WHIRLPOOL 40d86669721e274cba6b80b70b1382c5c977abef23cfabb1005140910c8d982c6f00425cf9e9309452286ec74da40f16cefede8694930f24096449e4fea1e344
-DIST webmin-1.680.tar.gz 22418010 SHA256 c6205b6a9dfa1aa7179591bb9a82a9f321e775ed08710da8877d01c5bf9b8078 SHA512 591ac89192c020a443af318a30664310d36d0b9880cd91ff5179bdb17fc01773abf3ae67a016e922fd4d319d311d16f9c9f79a9d07bd94018a38b0127549bc69 WHIRLPOOL 21729591197f971244f99a281da4a3f8af7c17673c1fd124cb9de2de28fd3e0e6688e38f782e735038f5735cbeac551ebab5eb7a417d7adc899794944490a54b
-EBUILD webmin-1.680.ebuild 9150 SHA256 5f40420b02cbf1471cdee8f7ad59e5b4a2e870666df52c44194204066aa32764 SHA512 fe257e3146a10359b97d04bee414adf90121aa21b02109e653df1acf227f157fdb3d1ec0a5823691d7c33b7383fba56a7981d15f235b82b8645d6767c5a4ad8a WHIRLPOOL 39989bb857eab0ff33c68389cd42d3de5c4d2b375250e47e9f92d8d8b06890ffd27c7cd30ed689400417820333f4d5cc4680d5d542a60247b90f424bed9bfb4b
-MISC ChangeLog 3629 SHA256 947ad16e396b7d23631159ac760f44699827f6b6279d1afd8e7479efcdfa2b47 SHA512 f760ed9117902a95a8dc0b76378f87ff24a0c8d5f4f213be6c59bb99e0bdfe682952d4104d2447134238b4fc8f792d761cdd91f116e8df474754bc5ecb07ae1b WHIRLPOOL 2085758a7fac3e74d08f4882b84770c6fafdacd3c944c5f68ca328bd37f517b1e69332bf523e876553aac3fe4ae5339119a0636fa15c0daadc13bca22d0c42dc
+AUX gentoo-setup 11934 SHA256 0d0c74c4d6bc2cc4aa79b2a6f8473bf615dcbf26173022d8fd91da942e3f8c1c SHA512 29c6d9e0b8c7909dd07ded43e1c3e03840cecadaee01dafc26fd81b1ff4fc3639e8f5a81a95e906ce0533b64ffe10bea076117ffc8d76ea9b2c5863e746bfe63 WHIRLPOOL 60fe434a96fa3e1707f714cfd49caad3c3e0d7e12c85b8d881faa1d4df5336aa90d3e39adec0743bbcf4ec03cf52e6fba0403741dc6f4b46765795fd5a0e83d5
+AUX init.d.webmin 2273 SHA256 2390a805885f088b9fe52691822d58154c6b4877dc290f18da220af7e07ad65b SHA512 435772cb2972845aaa364e187b04da2b61af29db2f2087c0e0365b4c9d4d5006385da4a56cc9bff7312d382d91587a1ac03faf8e98b8c5009f7fd3fc67188b29 WHIRLPOOL 7a85290836e8122ec7af7f0d2af46b11a2c131988dc835da78fc490cea7e7e5cfc0aa052e34a2ff6e85f35979b3c2e287ef79677924c172d2c27b20b95e39dbc
+AUX webmin.service 416 SHA256 f5e9301ad853929e15cb4c4860f8d3da5a27036bcaebce38a32ec81da798b8ef SHA512 7cf86342db3d34cbe39b62fa768660ba7dd160d9c0d113ef6a3a176187fa0c72531bed38e3203cf627ab05c1ac4d9a8b9e829d1baa9739d63dfa74f09c445f1e WHIRLPOOL 9d4fbe570364a94516cf5f66eb968209f9731b6a1f3083071f3c299d65c28559e35dd76ca7e2ac2f3e5381b854cb8b5a561c48388b761c3dbb4d57829c59520b
+DIST webmin-1.690-minimal.tar.gz 2594677 SHA256 e5644dc06947e201eba8570dbed72feb10442876dc1d3d1297d9698b0e042950 SHA512 8f223f20fc6b171f32c9c2def92eaad2d10f68e18328e9dbbca0b6c84560550b9f353aff0968ea77407cde5172249859d82d406e6c2acdf3e8df1e9347bcc409 WHIRLPOOL 2184c301a487130744265a95e55c29b9d97c2ae6906277c644917b9e7e50c414a7fc7e7040645f9041813cf2c223eacdd5f064e1cfc7f5431d9aa53ced198902
+DIST webmin-1.690.tar.gz 22486046 SHA256 f22642b4c8a4467a2ef1011ec674bf45b5f6a8e2bd8be42e3e24338a98e00757 SHA512 f46a286389a133abbf2adbd730e42b38f50c4de54caad8678e13bd396d34ca4064186e5033a2a840d31c764adefacc0735c81454fc00404b0fda3963ed609934 WHIRLPOOL b6e1607bd4de277c7327a7e4b8eeb8084e4cc7261c76e1d03a24dbbcac951f40020e0472957fb5359faf1652b8f355dc5cfccddf7842b8017ac6e7dc68a0a469
+EBUILD webmin-1.690.ebuild 10220 SHA256 852c1fdd8f41ae9c410da86212bd38afb2c4a606c522cd03152633d06856b330 SHA512 cc415bf5879f51118af054df16855b7cf2c683799922158e4077f83f0bd59b51f260062374a21d9bc888111f0ed74a61b4150b8a6c1583bf9cab0a201cfd6c72 WHIRLPOOL c6f2b1fb2a213a421767976ae04121f384fd26988e8106fd78e19516b039a175d20547ba980f09ab294b4cb843c929ae886caaf72a88d7aa60015f8f49022578
+MISC ChangeLog 3935 SHA256 aa949d744e536f336ddeea059c02cc43b37265805fa61afc06e7054ccc62b4f0 SHA512 d2d062973b025e554102125925c62514407a6db821b785edf4e970e6d9833b71eca2f305a54037be08f48833e1c3caaad8feebbacd6ec22d59298b78d8053dcd WHIRLPOOL 4fee68cb7315724ce9c63d83ea19c40f4fd2b372b97c5ed7c16fa857a17e3e96530f51aa0ef09f97f162131283540aa05167c74ddeafbf9805d72c387a1aa31f
MISC metadata.xml 326 SHA256 44e634f8f6afe175e696bb53be1749163798e22862c6ab40d81a70146e28269f SHA512 7c400180abd54e464c3570f046ecbf2489de6f83738bdbda83285df1ebc5354a532ea7495b842e39219649d729488bc00ba39bc426faefa24bc88090a136f8b6 WHIRLPOOL 9124acba12823edb57b989ca40913e408e1ed2f894822beab847b0b49bea86a8f974e984b444cb05d7d0881b21c1bcdaf5676c863a21098b2ef2b4e772bd2d98
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQJ8BAEBCABmBQJTYnY6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTkvebXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun887sAP/jdO/pszUPesSmC7j340pRGE
-F1bxyD9FDRgKzptFiK1oHZqgk5CdJcrlrEAFY+u+Ac2GTIkgFlzUWlU3vspRC+9N
-rS/9hU7JJpiVcXyIonCkCNF+bBwSDtqGcIKZsLPTTQbaMrZldBw+3HvOtNu5Hvct
-aJ5rLvXat3ufZoR3kty+37amWMuIR2TpqvOtYSn18eI2MLJm1VvKVFFA7/Mww0g7
-A9UYkFPTGMzg/TJZJIitPj2wknxGh02pFJYZH8SxvD+tTvRd9bzDQvWcxwdxuZHa
-COIKayTL1paozy1S5uUuzzCb6f8SrCTSy17rR5McRatlY19+zNqaoi8ronBrLijb
-bQ4AtBEW7CRtKHV1TNb9+ZQjG7BDqgQBn2q0SpIDb2aObO1uKtFTCkSWOprwoAWd
-ZfDNxIBNoUQZVHh6IwHWgVMrxrTe6Uo+oM7V5wygsdJrzeAy1z5MhvKFZm8oGSTa
-1b+JLsW4SGZJQWPfftx+UsTMCj0s4rCfaEVR5kp8hs70NsCBn+f9g0x3JmSoN9V5
-YiR8CqYfIogj8TtnX7TCljOvh6r7LA79/ClB6F3azYd9Pfc9sr4RLfx4FJBJgMMN
-gR0bK13FCt6GlqhXikCCxA6DHaIHr4Wd5vJwQyGNpQJuXMSKjZtWkifkT5rEAGvS
-2Vz5ZMREsBt0HhgjvsXH
-=olFo
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88GHQP/ikRHqjGaqMOvNG6FLLtcArO
+agPG2Ax0INCR/HP8LwgrIqNu56NRKFT70Jm+Pt3GG5nSUJgEYHpnRX0FI/D3WN5T
+5aoXdB2h1m0tiIgGy5KcjBm24lLEojHndTOaVvpyiT2CysVlFyyoQrfPv2fvr0zS
+uIx4ENBJbHD8d/QnUtkmKn3BYZQiCcy+hXoE1foJmxDWkXyYaGwJOjTJ33JQaD0Q
+0TZLgjtiBDcuGphD1G9NghGUWDvDGJb/Bvay2BMsnGMkDGcSAyJupllYpBPfqZfy
+J5d6C6a5GPeSIh8WQgRAbbX8SXLxSdmAP5QshL9bTCj4ooaumXWU5EOZGj8qybNi
+xBST7l+9iZy/7ByEXVSR2tEgaXRceN4ds2QSCW0jifY0Z+y8hbZJ3cLyEvZ1xMOu
+WmsqvH2atC2za9G9CaEvgNNNm2TYGeO5tb7zUFD3bIfIFlpUDBUe1768CzPNS3xm
+/HWxzEzXkfZRHb+sPEb9HLRrxF1lDHqBOelaFA+C7Hhtv7nwdQv1qU18B2Wp9UX8
+1R3jvkAaTOqJayr++X3hqCX8UQLuQwHVHwJ1yW/Mr7SAuSvRN/DDlv8H2Y5IlseG
+yT0je6kbMQogLLiDHM8JcVYq/cwAKZ4fihoiULtSVP5qu3nH7sDoRDvXShTq3wjy
+t8LeRdnBpI3HdISHVxRS
+=yu27
-----END PGP SIGNATURE-----
diff --git a/app-admin/webmin/files/gentoo-setup b/app-admin/webmin/files/gentoo-setup
index ef03a9a59059..3443bb02f67a 100755
--- a/app-admin/webmin/files/gentoo-setup
+++ b/app-admin/webmin/files/gentoo-setup
@@ -1,7 +1,7 @@
#!/bin/sh
# gentoo-setup.sh
#
-# Version 1.1
+# Version 1.2
#
# A modified original Webmin setup.sh script to comply with Gentoo specifics
#
@@ -193,6 +193,7 @@ fi
# Create start, stop, restart and reload Gentoo compliant Webmin scripts
# We use sys-apps/openrc functions which is already pulled by sys-apps/baselayout
+# or systemctl if we run under systemd
echo "Creating start and stop scripts.."
rm -f $config_dir/{start,stop,restart,reload}
@@ -201,7 +202,11 @@ cat <<END >>"$config_dir/start"
#!/bin/sh
if [ ! -f "${pidfile}" ]; then
- rc-service --ifexists -- webmin start
+ if [[ -d /run/systemd/system ]] ; then
+ systemctl start webmin.service
+ else
+ rc-service --ifexists -- webmin start
+ fi
fi
END
@@ -209,21 +214,33 @@ END
cat <<END >>"$config_dir/stop"
#!/bin/sh
-rc-service --ifexists -- webmin --ifstarted stop
+if [[ -d /run/systemd/system ]] ; then
+ systemctl stop webmin.service
+else
+ rc-service --ifexists -- webmin --ifstarted stop
+fi
END
# The restart script in /etc/webmin (Gentoo compliant)
cat <<END >>"$config_dir/restart"
#!/bin/sh
-rc-service --ifexists -- webmin --ifstarted restart
+if [[ -d /run/systemd/system ]] ; then
+ systemctl try-restart webmin.service
+else
+ rc-service --ifexists -- webmin --ifstarted restart
+fi
END
# The reload script in /etc/webmin (Gentoo compliant)
cat <<END >>"$config_dir/reload"
#!/bin/sh
-rc-service --ifexists -- webmin --ifstarted reload
+if [[ -d /run/systemd/system ]] ; then
+ systemctl reload-or-try-restart webmin.service
+else
+ rc-service --ifexists -- webmin --ifstarted reload
+fi
END
chmod 755 $config_dir/{start,stop,restart,reload}
diff --git a/app-admin/webmin/files/init.d.webmin b/app-admin/webmin/files/init.d.webmin
index bd1dc374bf36..d6aeb43305d3 100644
--- a/app-admin/webmin/files/init.d.webmin
+++ b/app-admin/webmin/files/init.d.webmin
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/files/init.d.webmin,v 1.11 2012/07/09 18:12:47 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/files/init.d.webmin,v 1.12 2014/06/07 11:29:32 hwoarang Exp $
# We do not give a choice to user for configuring these 'cause it will mess up
@@ -9,6 +9,7 @@
WEBMIN_EXE="%exe%"
WEBMIN_PID="%pid%"
WEBMIN_CONF="%conf%"
+WEBMIN_CONFIG="%config%"
extra_started_commands="reload"
@@ -18,8 +19,8 @@ depend() {
checkconfig() {
# Check if Webmin setup has been done
- if [ ! -f /etc/webmin/config ]; then
- eerror "Error in Webmin's configuration. The '/etc/webmin/config' is not present."
+ if [ ! -f ${WEBMIN_CONFIG} ]; then
+ eerror "Error in Webmin's configuration. The ${WEBMIN_CONFIG} is not present."
eerror "Please run 'emerge --config app-admin/webmin' to fix this."
return 1
fi
diff --git a/app-admin/webmin/files/webmin.service b/app-admin/webmin/files/webmin.service
new file mode 100644
index 000000000000..5bec85b97c8c
--- /dev/null
+++ b/app-admin/webmin/files/webmin.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=Webmin Administration Tool
+After=network.target remote-fs.target nss-lookup.target
+ConditionFileNotEmpty=%config%
+ConditionFileNotEmpty=%conf%
+
+[Service]
+RemainAfterExit=yes
+KillMode=mixed
+# Webmin is exiting with 1 on SIGTERM
+SuccessExitStatus=1
+ExecStart=%exe% %conf%
+PIDFile=%pid%
+Environment="PERLLIB=%perllib%" LANG=
+ExecReload=/bin/kill -USR1 $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/webmin/webmin-1.680.ebuild b/app-admin/webmin/webmin-1.690.ebuild
index f6d68f6cfbf8..ae64051f9906 100644
--- a/app-admin/webmin/webmin-1.680.ebuild
+++ b/app-admin/webmin/webmin-1.690.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.680.ebuild,v 1.1 2014/05/01 16:30:09 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.690.ebuild,v 1.1 2014/06/07 11:29:32 hwoarang Exp $
-EAPI="3"
+EAPI="5"
-inherit eutils pam ssl-cert
+inherit eutils pam ssl-cert systemd
DESCRIPTION="A web-based Unix systems administration interface"
HOMEPAGE="http://www.webmin.com/"
@@ -114,10 +114,22 @@ src_install() {
-e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
-e "s:%pid%:${EROOT}var/run/webmin.pid:" \
-e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
+ -e "s:%config%:${EROOT}etc/webmin/config:" \
-e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
"${ED}etc/init.d/webmin" \
|| die "Failed to patch the webmin init file"
+ # Create the systemd service file and put the neccessary variables there
+ systemd_newunit "${FILESDIR}"/webmin.service webmin.service
+ sed -i \
+ -e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
+ -e "s:%pid%:${EROOT}var/run/webmin.pid:" \
+ -e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
+ -e "s:%config%:${EROOT}etc/webmin/config:" \
+ -e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
+ "${ED}$(_systemd_get_unitdir)/webmin.service" \
+ || die "Failed to patch the webmin systemd service file"
+
# Setup pam
pamd_mimic system-auth webmin auth account session
@@ -130,7 +142,11 @@ src_install() {
pkg_preinst() {
# First stop service if running so Webmin to not messup our config
ebegin "Stopping any running Webmin instance prior merging"
- rc-service --ifexists -- webmin --ifstarted stop
+ if systemd_is_booted ; then
+ systemctl stop webmin.service 2>/dev/null
+ else
+ rc-service --ifexists -- webmin --ifstarted stop
+ fi
eend $?
}
@@ -147,7 +163,11 @@ pkg_postinst() {
ewarn "To avoid problems, please before using any module, look at its configuration options first."
ewarn "(Usually there is a link at top in the right pane of Webmin for configuring the module.)"
ewarn
- elog "- To make Webmin start at boot time, run: 'rc-update add webmin default'"
+ if systemd_is_booted ; then
+ elog "- To make Webmin start at boot time, run: 'systemctl enable webmin.service'"
+ else
+ elog "- To make Webmin start at boot time, run: 'rc-update add webmin default'"
+ fi
elog "- The default URL to connect to Webmin is: https://localhost:10000"
elog "- The default user that can login is: root"
elog "- To reconfigure Webmin in case of problems run 'emerge --config app-admin/webmin'"
@@ -156,23 +176,34 @@ pkg_postinst() {
pkg_prerm() {
# First stop service if running - we do not want Webmin to mess up config
ebegin "Stopping any running Webmin instance prior unmerging"
- rc-service --ifexists -- webmin --ifstarted stop
+ if systemd_is_booted ; then
+ systemctl stop webmin.service 2>/dev/null
+ else
+ rc-service --ifexists -- webmin --ifstarted stop
+ fi
eend $?
}
pkg_postrm() {
- ewarn
- ewarn "You have uninstalled Webmin, so have in mind that all cron jobs scheduled"
- ewarn "by Webmin for its own modules, are left active and they will fail when Webmin is missing."
- ewarn "To fix this just disable them if you intend to use Webmin again,"
- ewarn "OR delete them if not."
- ewarn
+ # If removing webmin completely, remind the user for the Webmin's own cron jobs.
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ ewarn
+ ewarn "You have uninstalled Webmin, so have in mind that all cron jobs scheduled"
+ ewarn "by Webmin for its own modules, are left active and they will fail when Webmin is missing."
+ ewarn "To fix this just disable them if you intend to use Webmin again,"
+ ewarn "OR delete them if not."
+ ewarn
+ fi
}
pkg_config(){
# First stop service if running
ebegin "Stopping any running Webmin instance"
- rc-service --ifexists -- webmin --ifstarted stop
+ if systemd_is_booted ; then
+ systemctl stop webmin.service 2>/dev/null
+ else
+ rc-service --ifexists -- webmin --ifstarted stop
+ fi
eend $?
# Next set the default reset variable to 'none'