From ebf53f5e5747d81d94b3abd7dd3dfe18fff2eeb0 Mon Sep 17 00:00:00 2001 From: Jeremy Davis Date: Thu, 14 May 2026 14:51:33 +1000 Subject: [PATCH 1/7] Explictly set journal tag as 'webmin' --- debian/webmin.service | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/webmin.service b/debian/webmin.service index f98de905..61b4af2e 100644 --- a/debian/webmin.service +++ b/debian/webmin.service @@ -13,6 +13,7 @@ PIDFile=/var/webmin/miniserv.pid Restart=always RestartSec=2s TimeoutSec=15s +SyslogIdentifier=webmin [Install] WantedBy=multi-user.target From 497c85d4f18522cf23f78e72202aabdcd2cc9bdd Mon Sep 17 00:00:00 2001 From: Jeremy Davis Date: Thu, 14 May 2026 16:29:43 +1000 Subject: [PATCH 2/7] Move postinst to webmin.postinst --- debian/{postinst => webmin.postinst} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename debian/{postinst => webmin.postinst} (100%) diff --git a/debian/postinst b/debian/webmin.postinst similarity index 100% rename from debian/postinst rename to debian/webmin.postinst From 25ed1a7dcc8067157550e4fbe10bf16fa269b3a7 Mon Sep 17 00:00:00 2001 From: Jeremy Davis Date: Fri, 15 May 2026 09:44:27 +1000 Subject: [PATCH 3/7] Add webmin logrotate conf --- debian/webmin.logrotate | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 debian/webmin.logrotate diff --git a/debian/webmin.logrotate b/debian/webmin.logrotate new file mode 100644 index 00000000..ecc18dcd --- /dev/null +++ b/debian/webmin.logrotate @@ -0,0 +1,17 @@ +/var/log/webmin/miniserv.log +/var/log/webmin/miniserv.error { + daily + rotate 14 + compress + delaycompress + missingok + notifempty + create 0640 root root + sharedscripts + postrotate + # Signal miniserv to reopen log files after rotation + if [ -f /var/webmin/miniserv.pid ]; then + kill -HUP $(cat /var/webmin/miniserv.pid) 2>/dev/null || true + fi + endscript +} From 969ebb8d89b1f6c4f906e355a2c6135509152a3e Mon Sep 17 00:00:00 2001 From: Jeremy Davis Date: Fri, 15 May 2026 09:50:33 +1000 Subject: [PATCH 4/7] Remove old sysvinit file --- debian/webmin.init | 61 ---------------------------------------------- 1 file changed, 61 deletions(-) delete mode 100755 debian/webmin.init diff --git a/debian/webmin.init b/debian/webmin.init deleted file mode 100755 index 9cf3b717..00000000 --- a/debian/webmin.init +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh - -### BEGIN INIT INFO -# Provides: webmin -# Required-Start: $all -# Required-Stop: $network -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Webmin -# Description: A web-based administration interface for Unix systems -### END INIT INFO - -NAME=webmin - -set -e -. /lib/lsb/init-functions - -case "$1" in - 'start') - log_begin_msg "Starting $NAME" - /etc/webmin/start >/dev/null 2>&1 Date: Fri, 15 May 2026 09:41:09 +1000 Subject: [PATCH 5/7] debian control updates; compat v13, minor format update --- debian/compat | 1 - debian/control | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 debian/compat diff --git a/debian/compat b/debian/compat deleted file mode 100644 index f599e28b..00000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/debian/control b/debian/control index 369e2f16..f2647318 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,10 @@ Source: webmin Section: admin Priority: optional Maintainer: Jeremy Davis -Build-Depends: debhelper (>= 10), gzip, tar +Build-Depends: + debhelper-compat (= 13), + gzip, + tar, Standards-Version: 4.0.0 Homepage: https://webmin.com/ Vcs-Browser: https://github.com/turnkeylinux/webmin/ From df91e5ca1efd8aca9c5609611aad969e04b55524 Mon Sep 17 00:00:00 2001 From: Jeremy Davis Date: Fri, 15 May 2026 09:43:12 +1000 Subject: [PATCH 6/7] Update/de-cruft debian/rules, new debian/webmin.install, update location of etc/pam.d/webmin --- debian/rules | 39 +++++--------------------------- debian/webmin.install | 2 ++ {debian/etc => etc}/pam.d/webmin | 0 3 files changed, 8 insertions(+), 33 deletions(-) create mode 100644 debian/webmin.install rename {debian/etc => etc}/pam.d/webmin (100%) diff --git a/debian/rules b/debian/rules index ba03aae7..231560fe 100755 --- a/debian/rules +++ b/debian/rules @@ -2,42 +2,15 @@ DH_VERBOSE = 1 -progname=$(shell awk '/^Source/ {print $$2}' debian/control) -buildroot=debian/$(progname) - -share=$(buildroot)/usr/share/$(progname) -tmp=debian/tmp - %: dh $@ -clean: - dh_clean - -build: - dh_prep - mkdir -p $(tmp) +override_dh_auto_build: + # no build step required - pure Perl/config package -install: build - dh_testdir - dh_testroot - mkdir -p $(share) - cp -aR webmin_core/* $(share) - dh_install debian/etc/pam.d/webmin etc/pam.d +override_dh_auto_install: + # run bash script for plugin install steps DH_VERBOSE=$(DH_VERBOSE) ./plugins_deb_rules.sh - rm -rf $(tmp) - -binary-indep: install - dh_testdir - dh_testroot - dh_installinit -r --no-start -- start 91 2 3 4 5 . stop 01 0 1 6 . - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-arch: install - -binary: binary-indep binary-arch -.PHONY: clean binary-indep binary-arch binary install +override_dh_installsystemd: + dh_installsystemd --no-start diff --git a/debian/webmin.install b/debian/webmin.install new file mode 100644 index 00000000..1e90bff6 --- /dev/null +++ b/debian/webmin.install @@ -0,0 +1,2 @@ +webmin_core/* usr/share/webmin/ +etc/* etc/ diff --git a/debian/etc/pam.d/webmin b/etc/pam.d/webmin similarity index 100% rename from debian/etc/pam.d/webmin rename to etc/pam.d/webmin From fa45c6891f06bdbb844ad9398821f3967513f364 Mon Sep 17 00:00:00 2001 From: Jeremy Davis Date: Fri, 15 May 2026 15:34:52 +1000 Subject: [PATCH 7/7] Update shebang in webmin files (default is /usr/local/bin/perl) --- debian/rules | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/rules b/debian/rules index 231560fe..649d22a6 100755 --- a/debian/rules +++ b/debian/rules @@ -12,5 +12,10 @@ override_dh_auto_install: # run bash script for plugin install steps DH_VERBOSE=$(DH_VERBOSE) ./plugins_deb_rules.sh +override_dh_install: + dh_install + find debian/webmin/usr/share/webmin -name "*.pl" -exec \ + sed -i '1s|^#!.*perl|#!/usr/bin/perl|' {} \; + override_dh_installsystemd: dh_installsystemd --no-start