Commit 5ca60798 authored by The Heavy's avatar The Heavy 🚂
Browse files

Merge branch 'master' into jammy

parents 09f23c9f 9371d9b8

README.md

+1 −0
Changes for README.md: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ After signing in you should run 'Re-check and refresh configuration' (should be 
- Running 'passwd' in the container will fail because /etc/shadow is actually a symlink, Webmin can manipulate the file just fine (I'm probably breaking some fundamental *nix concept here).

- A number of features are installed directly in the container when really they should be separate containers that Virtualmin can link to (e.g. MySQL, ClamAV, SpamAssassin, and so on), and which probably have perfectly good images I could direct you to.

- The Webmin certificate is generated during image build, this means all containers share the same default certificate which is bad for security.

- The DKIM selector and private key need randomising.



## Licence

root/etc/cont-init.d/50-virtualmin-config

+4 −2
Changes for root/etc/cont-init.d/50-virtualmin-config: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ symlinks=( \ 
/etc/group- \

/etc/logrotate.conf \

/etc/opendkim.conf \

/etc/opendkim \

/etc/passwd \

/etc/passwd- \

/etc/procmailrc \
@@ -87,6 +88,7 @@ MY_NAME=$(hostname) 


# if we have an FQDN, update the config files and replace the placeholders

[[ -n "$MY_DOMAIN" ]] && [[ -n "$MY_NAME" ]] && \

    sed -i --follow-symlinks -e "s#if-this-domain-resolves-someone-is-going-to-be-mad-at-me\.eteoxaoghtrhwfza#$MY_DOMAIN#" /etc/aliases /etc/webmin/status/config /etc/webmin/virtual-server/config /etc/webmin/config /etc/webmin/usermin/config /etc/webmin/package-updates/config /etc/postfix/main.cf && \

    sed -i --follow-symlinks -e "s#if-this-domain-resolves-someone-is-going-to-be-mad-at-me\.eteoxaoghtrhwfza#$MY_DOMAIN#" /etc/aliases /etc/webmin/status/config /etc/webmin/virtual-server/config /etc/webmin/config /etc/webmin/usermin/config /etc/webmin/package-updates/config /etc/postfix/main.cf /etc/opendkim/dkim-domains.txt && \

    sed -i --follow-symlinks -e "s#myhostname = .*#myhostname = $MY_NAME.$MY_DOMAIN#" /etc/postfix/main.cf && \

    sed -i --follow-symlinks -e "s#bind_master=.*#bind_master=$MY_NAME.$MY_DOMAIN#" /etc/webmin/virtual-server/config
 
    sed -i --follow-symlinks -e "s#bind_master=.*#bind_master=$MY_NAME.$MY_DOMAIN#" /etc/webmin/virtual-server/config && \

    sed -i --follow-symlinks -e "s#hostname#$MY_NAME#" /etc/opendkim/dkim-domains.txt

root/etc/opendkim/dkim-domains.txt

0 → 100644
+2 −0
Changes for root/etc/opendkim/dkim-domains.txt: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line 
hostname.if-this-domain-resolves-someone-is-going-to-be-mad-at-me\.eteoxaoghtrhwfza

hostname

root/etc/opendkim/dkim-keytable

0 → 100644
+1 −0
Changes for root/etc/opendkim/dkim-keytable: 1 added line, 0 removed lines.
Original line number Diff line number Diff line 
default %:oolielupebei:/config/etc/opendkim/dkim.key

root/etc/opendkim/dkim-signingtable

0 → 100644
+1 −0
Changes for root/etc/opendkim/dkim-signingtable: 1 added line, 0 removed lines.
Original line number Diff line number Diff line 
*   default