michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-06-09 22:40:23 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webmin/webmin

Browse Source
This commit is contained in:
Jamie Cameron
2026-01-04 13:34:12 -08:00
parent 191d8a255c d4ab826097
commit 94c0826499
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bind8/bind8-lib.pl
View File

@@ -1124,7 +1124,7 @@ else {
@v = ( );
}
if ($type eq "A" || $type eq "AAAA") {
print &ui_table_row($text{'value_A1'},
print &ui_table_row($text{"value_${type}1"},
&ui_textbox("value0", $v[0], 20)." ".
(!defined($_[5]) && $type eq "A" ?
&free_address_button("value0") : ""), 3);

3
makemodulerpm.pl
View File

@@ -551,6 +551,9 @@ if [ "$istheme" = "1" -a "\$1" = "0" ]; then
fi
# Run the pre-uninstall script, if we are not upgrading
if [ "$prog" = "webmin" -a "\$1" = "0" -a -r "/usr/libexec/$prog/$mod/uninstall.pl" ]; then
# Skip if replaced by a different package (wbm-foo - webmin-foo)
owner=\$(rpm -qf --qf '%%{NAME}\\n' "/usr/libexec/$prog/$mod/uninstall.pl" 2>/dev/null || true)
[ -n "\$owner" -a "\$owner" != "%{name}" ] && exit 0
cd /usr/libexec/$prog
WEBMIN_CONFIG=/etc/$prog WEBMIN_VAR=/var/$prog /usr/libexec/$prog/run-uninstalls.pl $mod
fi

1
os_list.txt
View File

@@ -128,6 +128,7 @@ Ubuntu Linux $1 debian-linux 11.0 $os_release =~ /Ubuntu\s+(20\.[0-9\.]+)/ ||
Ubuntu Linux $1 debian-linux 12.0 $os_release =~ /Ubuntu\s+(21\.[0-9\.]+)/ || $etc_issue =~ /Ubuntu.*\s(21\.[0-9\.]+)\s/i || $etc_issue =~ /Ubuntu\s+(hirsute|impish)/i
Ubuntu Linux $1 debian-linux 13.0 $os_release =~ /Ubuntu\s+(22\.[0-9\.]+)/ || $etc_issue =~ /Ubuntu.*\s(22\.[0-9\.]+)\s/i || $etc_issue =~ /Ubuntu\s+jammy/i
Ubuntu Linux $1 debian-linux 14.0 $os_release =~ /Ubuntu\s+(24\.[0-9\.]+)/ || $etc_issue =~ /Ubuntu.*\s(24\.[0-9\.]+)\s/i || $etc_issue =~ /Ubuntu\s+noble/i
Ubuntu Linux $1 debian-linux 15.0 $os_release =~ /Ubuntu\s+(26\.[0-9\.]+)/ || $etc_issue =~ /Ubuntu.*\s(26\.[0-9\.]+)\s/i || $etc_issue =~ /Ubuntu\s+resolute/i
Ubuntu Linux $1 debian-linux 3.1 $etc_issue =~ /Ubuntu.*\s([0-9\.]+)\s/i
Mepis Linux $1 debian-linux $1 $etc_issue =~ /MEPIS/ && `cat /etc/debian_version 2>/dev/null` =~ /([0-9\.]+)/
Mepis Linux $1 debian-linux 4.0 $etc_issue =~ /MEPIS/ && `cat /etc/debian_version 2>/dev/null` =~ /(stable)/

8
setup.sh
View File

@@ -839,8 +839,8 @@ if [ "$upgrading" != 1 ]; then
# Enable HSTS by default
echo "ssl_hsts=1" >> $config_dir/miniserv.conf
# Enable force redirect to SSL by default
echo "ssl_enforce=1" >> $config_dir/miniserv.conf
# Enable force redirect to SSL with HSTS by default
echo "ssl_enforce=2" >> $config_dir/miniserv.conf
# Disallow unknown referers by default
echo "referers_none=1" >>$config_dir/config
@@ -851,10 +851,10 @@ else
echo "ssl_hsts=1" >> $config_dir/miniserv.conf
fi
# Enable force redirect to SSL if not set
# Enable force redirect to SSL with HSTS if not set
grep ssl_enforce= $config_dir/miniserv.conf >/dev/null
if [ "$?" != "0" ]; then
echo "ssl_enforce=1" >> $config_dir/miniserv.conf
echo "ssl_enforce=2" >> $config_dir/miniserv.conf
fi
# Disallow unknown referers if not set