VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-07-23 00:30:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jamie Cameron
2025-01-27 21:47:03 -08:00
parent 60bba6cb81 ee3bf19a9b
commit 8d0367e6e6
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
makedebian.pl
View File

@ -129,18 +129,18 @@ if ($product eq "webmin") {
print CONTROL <<EOF;
Replaces: webmin-adsl, webmin-apache, webmin-bandwidth, webmin-bind, webmin-burner, webmin-cfengine, webmin-cluster, webmin-core, webmin-cpan, webmin-dhcpd, webmin-exim, webmin-exports, webmin-fetchmail, webmin-firewall, webmin-freeswan, webmin-frox, webmin-fsdump, webmin-grub, webmin-heartbeat, webmin-htaccess, webmin-inetd, webmin-jabber, webmin-ldap-netgroups, webmin-ldap-user-simple, webmin-ldap-useradmin, webmin-lilo, webmin-logrotate, webmin-lpadmin, webmin-lvm, webmin-mailboxes, webmin-mon, webmin-mysql, webmin-nis, webmin-openslp, webmin-postfix, webmin-postgresql, webmin-ppp, webmin-pptp-client, webmin-pptp-server, webmin-procmail, webmin-proftpd, webmin-pserver, webmin-quota, webmin-samba, webmin-sarg, webmin-sendmail, webmin-shorewall, webmin-slbackup, webmin-smart-status, webmin-snort, webmin-software, webmin-spamassassin, webmin-squid, webmin-sshd, webmin-status, webmin-stunnel, webmin-updown, webmin-usermin, webmin-vgetty, webmin-webalizer, webmin-wuftpd, webmin-wvdial, webmin-xinetd, webmin-filemin, webmin-authentic-theme
Description: web-based administration interface for Unix systems
Using Webmin you can configure DNS, Samba, NFS, local/remote filesystems
and more using your web browser. After installation, enter the URL
https://localhost:10000/ into your browser and login as root with your root
password.
Using Webmin you can configure DNS, Samba, NFS, local/remote filesystems
and more using your web browser. After installation, enter the URL
https://localhost:10000/ into your browser and login as root with your root
password.
EOF
}
else {
print CONTROL <<EOF;
Replaces: usermin-at, usermin-changepass, usermin-chfn, usermin-commands, usermin-cron, usermin-cshrc, usermin-fetchmail, usermin-forward, usermin-gnupg, usermin-htaccess, usermin-htpasswd, usermin-mailbox, usermin-man, usermin-mysql, usermin-plan, usermin-postgresql, usermin-proc, usermin-procmail, usermin-quota, usermin-schedule, usermin-shell, usermin-spamassassin, usermin-ssh, usermin-tunnel, usermin-updown, usermin-usermount, usermin-filemin, usermin-authentic-theme
Description: web-based user account administration interface for Unix systems
After installation, enter the URL http://localhost:20000/ into your browser
and login as any user on your system.
After installation, enter the URL http://localhost:20000/ into your browser
and login as any user on your system.
EOF
}
close(CONTROL);

20
webmin-setup-repo.sh
View File

@ -67,6 +67,7 @@ Repository configuration:
--auth-user=<user> Repository authentication username
--auth-pass=<pass> Repository authentication password
--pkg-prefs=<dist:pkg|pr*> Package preferences for repository
--repo-prefs=<dist:opts> Optional preferences for repository
Repository metadata:
--name=<name> Base name for repository (default: webmin)
@ -134,6 +135,9 @@ process_args() {
--pkg-prefs=*)
repo_pkg_prefs="${arg#*=}"
;;
--repo-prefs=*)
repo_prefs="${arg#*=}"
;;
--name=*)
base_name="${arg#*=}"
repo_name="$base_name"
@ -359,6 +363,15 @@ download_key() {
post_status $? "$(echo "$download_out" | tr '\n' ' ')"
}
rpm_repo_prefs() {
for pref in $repo_prefs; do
if echo "$pref" | grep "^rpm:" >/dev/null 2>&1; then
val=$(echo "$pref" | sed 's/^rpm://')
printf '%s\n' "$val"
fi
done
}
setup_repos() {
repo_desc_formatted=$(echo "$active_repo_description" | \
sed 's/\([^ ]*\)\(.*\)/\1\L\2/')
@ -399,6 +412,7 @@ setup_repos() {
else
repo_url="$repo_auth_url"
fi
repo_extra_opts_caller=$(rpm_repo_prefs)
cat << EOF > "$rpm_repo_file"
[$active_repo_name-noarch]
name=$active_repo_description
@ -406,8 +420,12 @@ baseurl=$repo_url
enabled=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-$repo_key_suffix
gpgcheck=1
$repo_extra_opts
EOF
# Append non-empty options if they exist to keep config file clean
[ -n "$repo_extra_opts" ] && \
printf '%s\n' "$repo_extra_opts" >> "$rpm_repo_file"
[ -n "$repo_extra_opts_caller" ] && \
printf '%s\n' "$repo_extra_opts_caller" >> "$rpm_repo_file"
echo " .. done"
echo " Downloading repository metadata .."
update_output=$($update 2>&1)