maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'main' of github.com:Froxlor/Froxlor

Browse Source
This commit is contained in:
Michael Kaufmann
2022-10-18 08:57:48 +02:00
parent 3e931443f7 afc821099a
commit 5b3db2f096
3 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Froxlor/Cli/ConfigServices.php
View File

@@ -46,7 +46,7 @@ final class ConfigServices extends CliCommand
'bullseye', 'bullseye',
'buster', 'buster',
'focal', 'focal',
/* 'jammy', */ 'jammy',
]; ];
protected function configure() protected function configure()

64
lib/configfiles/bookworm.xml
View File

@@ -1477,7 +1477,7 @@ user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD> password = <SQL_UNPRIVILEGED_PASSWORD>
dbname = <SQL_DB> dbname = <SQL_DB>
hosts = <SQL_HOST> hosts = <SQL_HOST>
query = SELECT destination FROM mail_virtual AS v, panel_customers AS c WHERE c.customerid = v.customerid AND c.deactivated = 0 AND v.email = '%s' AND trim(v.destination) <> '' query = SELECT destination FROM mail_virtual AS v, panel_customers AS c WHERE c.customerid = v.customerid AND c.deactivated = 0 AND v.email = '%s' AND trim(v.destination) <> ''
]]> ]]>
</content> </content>
</file> </file>
@@ -1646,7 +1646,7 @@ data_directory = /var/lib/postfix
#default_privs = nobody #default_privs = nobody
# INTERNET HOST AND DOMAIN NAMES # INTERNET HOST AND DOMAIN NAMES
# #
# The myhostname parameter specifies the internet hostname of this # The myhostname parameter specifies the internet hostname of this
# mail system. The default is to use the fully-qualified domain name # mail system. The default is to use the fully-qualified domain name
# from gethostname(). $myhostname is used as a default value for many # from gethostname(). $myhostname is used as a default value for many
@@ -1672,7 +1672,7 @@ myhostname = mail.$mydomain
mydomain = <SERVERNAME> mydomain = <SERVERNAME>
# SENDING MAIL # SENDING MAIL
# #
# The myorigin parameter specifies the domain that locally-posted # The myorigin parameter specifies the domain that locally-posted
# mail appears to come from. The default is to append $myhostname, # mail appears to come from. The default is to append $myhostname,
# which is fine for small sites. If you run a domain with multiple # which is fine for small sites. If you run a domain with multiple
@@ -1774,7 +1774,7 @@ mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain
# #
# - You define $mydestination domain recipients in files other than # - You define $mydestination domain recipients in files other than
# /etc/passwd, /etc/aliases, or the $virtual_alias_maps files. # /etc/passwd, /etc/aliases, or the $virtual_alias_maps files.
# For example, you define $mydestination domain recipients in # For example, you define $mydestination domain recipients in
# the $virtual_mailbox_maps files. # the $virtual_mailbox_maps files.
# #
# - You redefine the local delivery agent in master.cf. # - You redefine the local delivery agent in master.cf.
@@ -1794,7 +1794,7 @@ mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain
# The right-hand side of the lookup tables is conveniently ignored. # The right-hand side of the lookup tables is conveniently ignored.
# In the left-hand side, specify a bare username, an @domain.tld # In the left-hand side, specify a bare username, an @domain.tld
# wild-card, or specify a user@domain.tld address. # wild-card, or specify a user@domain.tld address.
# #
#local_recipient_maps = unix:passwd.byname $alias_maps #local_recipient_maps = unix:passwd.byname $alias_maps
#local_recipient_maps = proxy:unix:passwd.byname $alias_maps #local_recipient_maps = proxy:unix:passwd.byname $alias_maps
#local_recipient_maps = #local_recipient_maps =
@@ -1826,16 +1826,16 @@ unknown_local_recipient_reject_code = 550
# clients in the same IP subnetworks as the local machine. # clients in the same IP subnetworks as the local machine.
# On Linux, this does works correctly only with interfaces specified # On Linux, this does works correctly only with interfaces specified
# with the "ifconfig" command. # with the "ifconfig" command.
# #
# Specify "mynetworks_style = class" when Postfix should "trust" SMTP # Specify "mynetworks_style = class" when Postfix should "trust" SMTP
# clients in the same IP class A/B/C networks as the local machine. # clients in the same IP class A/B/C networks as the local machine.
# Don't do this with a dialup site - it would cause Postfix to "trust" # Don't do this with a dialup site - it would cause Postfix to "trust"
# your entire provider's network. Instead, specify an explicit # your entire provider's network. Instead, specify an explicit
# mynetworks list by hand, as described below. # mynetworks list by hand, as described below.
# #
# Specify "mynetworks_style = host" when Postfix should "trust" # Specify "mynetworks_style = host" when Postfix should "trust"
# only the local machine. # only the local machine.
# #
#mynetworks_style = class #mynetworks_style = class
#mynetworks_style = subnet #mynetworks_style = subnet
#mynetworks_style = host #mynetworks_style = host
@@ -1865,7 +1865,7 @@ mynetworks = 127.0.0.0/8
# - from "untrusted" clients to destinations that match $relay_domains or # - from "untrusted" clients to destinations that match $relay_domains or
# subdomains thereof, except addresses with sender-specified routing. # subdomains thereof, except addresses with sender-specified routing.
# The default relay_domains value is $mydestination. # The default relay_domains value is $mydestination.
# #
# In addition to the above, the Postfix SMTP server by default accepts mail # In addition to the above, the Postfix SMTP server by default accepts mail
# that Postfix is final destination for: # that Postfix is final destination for:
# - destinations that match $inet_interfaces or $proxy_interfaces, # - destinations that match $inet_interfaces or $proxy_interfaces,
@@ -1873,7 +1873,7 @@ mynetworks = 127.0.0.0/8
# - destinations that match $virtual_alias_domains, # - destinations that match $virtual_alias_domains,
# - destinations that match $virtual_mailbox_domains. # - destinations that match $virtual_mailbox_domains.
# These destinations do not need to be listed in $relay_domains. # These destinations do not need to be listed in $relay_domains.
# #
# Specify a list of hosts or domains, /file/name patterns or type:name # Specify a list of hosts or domains, /file/name patterns or type:name
# lookup tables, separated by commas and/or whitespace. Continue # lookup tables, separated by commas and/or whitespace. Continue
# long lines by starting the next line with whitespace. A file name # long lines by starting the next line with whitespace. A file name
@@ -1918,7 +1918,7 @@ mynetworks = 127.0.0.0/8
# The right-hand side of the lookup tables is conveniently ignored. # The right-hand side of the lookup tables is conveniently ignored.
# In the left-hand side, specify an @domain.tld wild-card, or specify # In the left-hand side, specify an @domain.tld wild-card, or specify
# a user@domain.tld address. # a user@domain.tld address.
# #
#relay_recipient_maps = hash:/etc/postfix/relay_recipients #relay_recipient_maps = hash:/etc/postfix/relay_recipients
# INPUT RATE CONTROL # INPUT RATE CONTROL
@@ -1927,15 +1927,15 @@ mynetworks = 127.0.0.0/8
# flow control. This feature is turned on by default, although it # flow control. This feature is turned on by default, although it
# still needs further development (it's disabled on SCO UNIX due # still needs further development (it's disabled on SCO UNIX due
# to an SCO bug). # to an SCO bug).
# #
# A Postfix process will pause for $in_flow_delay seconds before # A Postfix process will pause for $in_flow_delay seconds before
# accepting a new message, when the message arrival rate exceeds the # accepting a new message, when the message arrival rate exceeds the
# message delivery rate. With the default 100 SMTP server process # message delivery rate. With the default 100 SMTP server process
# limit, this limits the mail inflow to 100 messages a second more # limit, this limits the mail inflow to 100 messages a second more
# than the number of messages delivered per second. # than the number of messages delivered per second.
# #
# Specify 0 to disable the feature. Valid delays are 0..10. # Specify 0 to disable the feature. Valid delays are 0..10.
# #
#in_flow_delay = 1s #in_flow_delay = 1s
# ADDRESS REWRITING # ADDRESS REWRITING
@@ -1965,7 +1965,7 @@ mynetworks = 127.0.0.0/8
# On systems with NIS, the default is to search the local alias # On systems with NIS, the default is to search the local alias
# database, then the NIS alias database. See aliases(5) for syntax # database, then the NIS alias database. See aliases(5) for syntax
# details. # details.
# #
# If you change the alias database, run "postalias /etc/aliases" (or # If you change the alias database, run "postalias /etc/aliases" (or
# wherever your system stores the mail alias file), or simply run # wherever your system stores the mail alias file), or simply run
# "newaliases" to build the necessary DBM or DB file. # "newaliases" to build the necessary DBM or DB file.
@@ -2008,7 +2008,7 @@ mynetworks = 127.0.0.0/8
# #
#home_mailbox = Mailbox #home_mailbox = Mailbox
#home_mailbox = Maildir/ #home_mailbox = Maildir/
# The mail_spool_directory parameter specifies the directory where # The mail_spool_directory parameter specifies the directory where
# UNIX-style mailboxes are kept. The default setting depends on the # UNIX-style mailboxes are kept. The default setting depends on the
# system type. # system type.
@@ -2050,7 +2050,7 @@ mailbox_command = /usr/lib/dovecot/deliver
# #
# NOTE: if you use this feature for accounts not in the UNIX password # NOTE: if you use this feature for accounts not in the UNIX password
# file, then you must update the "local_recipient_maps" setting in # file, then you must update the "local_recipient_maps" setting in
# the main.cf file, otherwise the SMTP server will reject mail for # the main.cf file, otherwise the SMTP server will reject mail for
# non-UNIX accounts with "User unknown in local recipient table". # non-UNIX accounts with "User unknown in local recipient table".
# #
# Cyrus IMAP over LMTP. Specify ``lmtpunix cmd="lmtpd" # Cyrus IMAP over LMTP. Specify ``lmtpunix cmd="lmtpd"
@@ -2072,7 +2072,7 @@ mailbox_command = /usr/lib/dovecot/deliver
# #
# NOTE: if you use this feature for accounts not in the UNIX password # NOTE: if you use this feature for accounts not in the UNIX password
# file, then you must update the "local_recipient_maps" setting in # file, then you must update the "local_recipient_maps" setting in
# the main.cf file, otherwise the SMTP server will reject mail for # the main.cf file, otherwise the SMTP server will reject mail for
# non-UNIX accounts with "User unknown in local recipient table". # non-UNIX accounts with "User unknown in local recipient table".
# #
#fallback_transport = lmtp:unix:/file/name #fallback_transport = lmtp:unix:/file/name
@@ -2095,15 +2095,15 @@ mailbox_command = /usr/lib/dovecot/deliver
# #
# NOTE: if you use this feature for accounts not in the UNIX password # NOTE: if you use this feature for accounts not in the UNIX password
# file, then you must specify "local_recipient_maps =" (i.e. empty) in # file, then you must specify "local_recipient_maps =" (i.e. empty) in
# the main.cf file, otherwise the SMTP server will reject mail for # the main.cf file, otherwise the SMTP server will reject mail for
# non-UNIX accounts with "User unknown in local recipient table". # non-UNIX accounts with "User unknown in local recipient table".
# #
#luser_relay = $user@other.host #luser_relay = $user@other.host
#luser_relay = $local@other.host #luser_relay = $local@other.host
#luser_relay = admin+$local #luser_relay = admin+$local
# JUNK MAIL CONTROLS # JUNK MAIL CONTROLS
# #
# The controls listed here are only a very small subset. The file # The controls listed here are only a very small subset. The file
# SMTPD_ACCESS_README provides an overview. # SMTPD_ACCESS_README provides an overview.
@@ -2125,11 +2125,11 @@ mailbox_command = /usr/lib/dovecot/deliver
# deferred mail, so that mail can be flushed quickly with the SMTP # deferred mail, so that mail can be flushed quickly with the SMTP
# "ETRN domain.tld" command, or by executing "sendmail -qRdomain.tld". # "ETRN domain.tld" command, or by executing "sendmail -qRdomain.tld".
# See the ETRN_README document for a detailed description. # See the ETRN_README document for a detailed description.
# #
# The fast_flush_domains parameter controls what destinations are # The fast_flush_domains parameter controls what destinations are
# eligible for this service. By default, they are all domains that # eligible for this service. By default, they are all domains that
# this server is willing to relay mail to. # this server is willing to relay mail to.
# #
#fast_flush_domains = $relay_domains #fast_flush_domains = $relay_domains
# SHOW SOFTWARE VERSION OR NOT # SHOW SOFTWARE VERSION OR NOT
@@ -2155,7 +2155,7 @@ smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU)
# too many are run at the same time. With SMTP deliveries, 10 # too many are run at the same time. With SMTP deliveries, 10
# simultaneous connections to the same domain could be sufficient to # simultaneous connections to the same domain could be sufficient to
# raise eyebrows. # raise eyebrows.
# #
# Each message delivery transport has its XXX_destination_concurrency_limit # Each message delivery transport has its XXX_destination_concurrency_limit
# parameter. The default is $default_destination_concurrency_limit for # parameter. The default is $default_destination_concurrency_limit for
# most delivery transports. For the local delivery agent the default is 2. # most delivery transports. For the local delivery agent the default is 2.
@@ -2213,11 +2213,11 @@ debugger_command =
# INSTALL-TIME CONFIGURATION INFORMATION # INSTALL-TIME CONFIGURATION INFORMATION
# #
# The following parameters are used when installing a new Postfix version. # The following parameters are used when installing a new Postfix version.
# #
# sendmail_path: The full pathname of the Postfix sendmail command. # sendmail_path: The full pathname of the Postfix sendmail command.
# This is the Sendmail-compatible mail posting interface. # This is the Sendmail-compatible mail posting interface.
# #
sendmail_path = /usr/sbin/sendmail sendmail_path = /usr/sbin/sendmail
# newaliases_path: The full pathname of the Postfix newaliases command. # newaliases_path: The full pathname of the Postfix newaliases command.
# This is the Sendmail-compatible command to build alias databases. # This is the Sendmail-compatible command to build alias databases.
@@ -2226,7 +2226,7 @@ newaliases_path = /usr/bin/newaliases
# mailq_path: The full pathname of the Postfix mailq command. This # mailq_path: The full pathname of the Postfix mailq command. This
# is the Sendmail-compatible mail queue listing command. # is the Sendmail-compatible mail queue listing command.
# #
mailq_path = /usr/bin/mailq mailq_path = /usr/bin/mailq
# setgid_group: The group for mail submission and queue management # setgid_group: The group for mail submission and queue management
@@ -3280,9 +3280,9 @@ aliases: files
<command><![CDATA[useradd -s /bin/false -g {{settings.system.mod_fcgid_httpgroup}} {{settings.system.mod_fcgid_httpuser}}]]></command> <command><![CDATA[useradd -s /bin/false -g {{settings.system.mod_fcgid_httpgroup}} {{settings.system.mod_fcgid_httpuser}}]]></command>
<command><![CDATA[mkdir -p {{settings.system.mod_fcgid_configdir}}]]></command> <command><![CDATA[mkdir -p {{settings.system.mod_fcgid_configdir}}]]></command>
<command><![CDATA[mkdir -p {{settings.system.mod_fcgid_tmpdir}}]]></command> <command><![CDATA[mkdir -p {{settings.system.mod_fcgid_tmpdir}}]]></command>
<command><![CDATA[a2dismod php7.4]]></command> <command><![CDATA[a2dismod php8.1]]></command>
</commands> </commands>
<!-- instead of just restarting apache, we let the cronjob do all the <!-- instead of just restarting apache, we let the cronjob do all the
dirty work --> dirty work -->
<command><![CDATA[php {{const.install_dir}}bin/froxlor-cli froxlor:cron --force]]></command> <command><![CDATA[php {{const.install_dir}}bin/froxlor-cli froxlor:cron --force]]></command>
</daemon> </daemon>
@@ -3313,9 +3313,9 @@ aliases: files
</visibility> </visibility>
<visibility mode="true">{{settings.phpfpm.enabled_ownvhost}} <visibility mode="true">{{settings.phpfpm.enabled_ownvhost}}
</visibility> </visibility>
<command><![CDATA[a2dismod php7.4]]></command> <command><![CDATA[a2dismod php8.1]]></command>
</commands> </commands>
<!-- instead of just restarting apache, we let the cronjob do all the <!-- instead of just restarting apache, we let the cronjob do all the
dirty work --> dirty work -->
<command><![CDATA[php {{const.install_dir}}bin/froxlor-cli froxlor:cron --force]]></command> <command><![CDATA[php {{const.install_dir}}bin/froxlor-cli froxlor:cron --force]]></command>
</daemon> </daemon>

12
lib/configfiles/jammy.xml
View File

@@ -1506,7 +1506,7 @@ user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD> password = <SQL_UNPRIVILEGED_PASSWORD>
dbname = <SQL_DB> dbname = <SQL_DB>
hosts = <SQL_HOST> hosts = <SQL_HOST>
query = SELECT destination FROM mail_virtual AS v, panel_customers AS c WHERE c.customerid = v.customerid AND c.deactivated = 0 AND v.email = '%s' AND trim(v.destination) <> '' query = SELECT destination FROM mail_virtual AS v, panel_customers AS c WHERE c.customerid = v.customerid AND c.deactivated = 0 AND v.email = '%s' AND trim(v.destination) <> ''
]]> ]]>
</content> </content>
</file> </file>
@@ -1631,7 +1631,7 @@ readme_directory = no
compatibility_level = 2 compatibility_level = 2
# INTERNET HOST AND DOMAIN NAMES # INTERNET HOST AND DOMAIN NAMES
# #
# The myhostname parameter specifies the internet hostname of this # The myhostname parameter specifies the internet hostname of this
# mail system. The default is to use the fully-qualified domain name # mail system. The default is to use the fully-qualified domain name
# from gethostname(). $myhostname is used as a default value for many # from gethostname(). $myhostname is used as a default value for many
@@ -4066,9 +4066,9 @@ aliases: files
<command><![CDATA[useradd -s /bin/false -g {{settings.system.mod_fcgid_httpgroup}} {{settings.system.mod_fcgid_httpuser}}]]></command> <command><![CDATA[useradd -s /bin/false -g {{settings.system.mod_fcgid_httpgroup}} {{settings.system.mod_fcgid_httpuser}}]]></command>
<command><![CDATA[mkdir -p {{settings.system.mod_fcgid_configdir}}]]></command> <command><![CDATA[mkdir -p {{settings.system.mod_fcgid_configdir}}]]></command>
<command><![CDATA[mkdir -p {{settings.system.mod_fcgid_tmpdir}}]]></command> <command><![CDATA[mkdir -p {{settings.system.mod_fcgid_tmpdir}}]]></command>
<command><![CDATA[a2dismod php7.4]]></command> <command><![CDATA[a2dismod php8.1]]></command>
</commands> </commands>
<!-- instead of just restarting apache, we let the cronjob do all the <!-- instead of just restarting apache, we let the cronjob do all the
dirty work --> dirty work -->
<command><![CDATA[php {{const.install_dir}}bin/froxlor-cli froxlor:cron --force]]></command> <command><![CDATA[php {{const.install_dir}}bin/froxlor-cli froxlor:cron --force]]></command>
</daemon> </daemon>
@@ -4099,9 +4099,9 @@ aliases: files
</visibility> </visibility>
<visibility mode="true">{{settings.phpfpm.enabled_ownvhost}} <visibility mode="true">{{settings.phpfpm.enabled_ownvhost}}
</visibility> </visibility>
<command><![CDATA[a2dismod php7.4]]></command> <command><![CDATA[a2dismod php8.1]]></command>
</commands> </commands>
<!-- instead of just restarting apache, we let the cronjob do all the <!-- instead of just restarting apache, we let the cronjob do all the
dirty work --> dirty work -->
<command><![CDATA[php {{const.install_dir}}bin/froxlor-cli froxlor:cron --force]]></command> <command><![CDATA[php {{const.install_dir}}bin/froxlor-cli froxlor:cron --force]]></command>
</daemon> </daemon>