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

use preinstalled dh params file instead of generating a new one which takes a lot of time

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-11-13 15:09:16 +01:00
parent cc1d427a69
commit 6904acc9ea
8 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Froxlor/Install/Install/Core.php
View File

@@ -393,10 +393,8 @@ class Core
$this->updateSetting($upd_stmt, 'apache2', 'system', 'webserver'); $this->updateSetting($upd_stmt, 'apache2', 'system', 'webserver');
$this->updateSetting($upd_stmt, '1', 'system', 'apache24'); $this->updateSetting($upd_stmt, '1', 'system', 'apache24');
} elseif ($this->validatedData['webserver'] == "lighttpd") { } elseif ($this->validatedData['webserver'] == "lighttpd") {
$this->updateSetting($upd_stmt, '/etc/lighttpd/lighttpd.pem', 'system', 'ssl_cert_file');
$this->updateSetting($upd_stmt, '/var/run/lighttpd/', 'phpfpm', 'fastcgi_ipcdir'); $this->updateSetting($upd_stmt, '/var/run/lighttpd/', 'phpfpm', 'fastcgi_ipcdir');
} elseif ($this->validatedData['webserver'] == "nginx") { } elseif ($this->validatedData['webserver'] == "nginx") {
$this->updateSetting($upd_stmt, '/etc/nginx/nginx.pem', 'system', 'ssl_cert_file');
$this->updateSetting($upd_stmt, '/var/run/', 'phpfpm', 'fastcgi_ipcdir'); $this->updateSetting($upd_stmt, '/var/run/', 'phpfpm', 'fastcgi_ipcdir');
$this->updateSetting($upd_stmt, 'error', 'system', 'errorlog_level'); $this->updateSetting($upd_stmt, 'error', 'system', 'errorlog_level');
} }

3
lib/configfiles/bionic.xml
View File

@@ -3462,7 +3462,7 @@ ssl_key = <<SSL_KEY_FILE>
# Generate new params with `openssl dhparam -out /etc/dovecot/dh.pem 4096` # Generate new params with `openssl dhparam -out /etc/dovecot/dh.pem 4096`
# Or migrate from old ssl-parameters.dat file with the command dovecot # Or migrate from old ssl-parameters.dat file with the command dovecot
# gives on startup when ssl_dh is unset. # gives on startup when ssl_dh is unset.
ssl_dh = </etc/dovecot/dh.pem ssl_dh = </usr/share/dovecot/dh.pem
# SSL protocols to use # SSL protocols to use
#ssl_protocols = !SSLv3 #ssl_protocols = !SSLv3
@@ -3911,7 +3911,6 @@ plugin {
</file> </file>
</files> </files>
<commands index="1"> <commands index="1">
<command><![CDATA[openssl dhparam -out /etc/dovecot/dh.pem 4096]]></command>
<command><![CDATA[/etc/init.d/dovecot restart]]></command> <command><![CDATA[/etc/init.d/dovecot restart]]></command>
</commands> </commands>
</general> </general>

3
lib/configfiles/bookworm.xml
View File

@@ -2522,7 +2522,7 @@ service stats {
ssl = yes ssl = yes
ssl_cert = <<SSL_CERT_FILE> ssl_cert = <<SSL_CERT_FILE>
ssl_key = <<SSL_KEY_FILE> ssl_key = <<SSL_KEY_FILE>
ssl_dh = </etc/dovecot/dh.pem ssl_dh = </usr/share/dovecot/dh.pem
postmaster_address = postmaster@<SERVERNAME> postmaster_address = postmaster@<SERVERNAME>
@@ -2545,7 +2545,6 @@ plugin {
</file> </file>
</files> </files>
<commands index="1"> <commands index="1">
<command><![CDATA[openssl dhparam -out /etc/dovecot/dh.pem 4096]]></command>
<command><![CDATA[service dovecot restart]]></command> <command><![CDATA[service dovecot restart]]></command>
</commands> </commands>
</general> </general>

3
lib/configfiles/bullseye.xml
View File

@@ -3500,7 +3500,7 @@ ssl_client_ca_dir = /etc/ssl/certs
# Generate new params with `openssl dhparam -out /etc/dovecot/dh.pem 4096` # Generate new params with `openssl dhparam -out /etc/dovecot/dh.pem 4096`
# Or migrate from old ssl-parameters.dat file with the command dovecot # Or migrate from old ssl-parameters.dat file with the command dovecot
# gives on startup when ssl_dh is unset. # gives on startup when ssl_dh is unset.
ssl_dh = </etc/dovecot/dh.pem ssl_dh = </usr/share/dovecot/dh.pem
# Minimum SSL protocol version to use. Potentially recognized values are SSLv3, # Minimum SSL protocol version to use. Potentially recognized values are SSLv3,
# TLSv1, TLSv1.1, and TLSv1.2, depending on the OpenSSL version used. # TLSv1, TLSv1.1, and TLSv1.2, depending on the OpenSSL version used.
@@ -4115,7 +4115,6 @@ plugin {
</file> </file>
</files> </files>
<commands index="1"> <commands index="1">
<command><![CDATA[openssl dhparam -out /etc/dovecot/dh.pem 4096]]></command>
<command><![CDATA[service dovecot restart]]></command> <command><![CDATA[service dovecot restart]]></command>
</commands> </commands>
</general> </general>

3
lib/configfiles/buster.xml
View File

@@ -3496,7 +3496,7 @@ ssl_client_ca_dir = /etc/ssl/certs
# Generate new params with `openssl dhparam -out /etc/dovecot/dh.pem 4096` # Generate new params with `openssl dhparam -out /etc/dovecot/dh.pem 4096`
# Or migrate from old ssl-parameters.dat file with the command dovecot # Or migrate from old ssl-parameters.dat file with the command dovecot
# gives on startup when ssl_dh is unset. # gives on startup when ssl_dh is unset.
ssl_dh = </etc/dovecot/dh.pem ssl_dh = </usr/share/dovecot/dh.pem
# Minimum SSL protocol version to use. Potentially recognized values are SSLv3, # Minimum SSL protocol version to use. Potentially recognized values are SSLv3,
# TLSv1, TLSv1.1, and TLSv1.2, depending on the OpenSSL version used. # TLSv1, TLSv1.1, and TLSv1.2, depending on the OpenSSL version used.
@@ -4110,7 +4110,6 @@ plugin {
</file> </file>
</files> </files>
<commands index="1"> <commands index="1">
<command><![CDATA[openssl dhparam -out /etc/dovecot/dh.pem 4096]]></command>
<command><![CDATA[/etc/init.d/dovecot restart]]></command> <command><![CDATA[/etc/init.d/dovecot restart]]></command>
</commands> </commands>
</general> </general>

3
lib/configfiles/focal.xml
View File

@@ -2878,7 +2878,7 @@ ssl_key = <<SSL_KEY_FILE>
# Generate new params with `openssl dhparam -out /etc/dovecot/dh.pem 4096` # Generate new params with `openssl dhparam -out /etc/dovecot/dh.pem 4096`
# Or migrate from old ssl-parameters.dat file with the command dovecot # Or migrate from old ssl-parameters.dat file with the command dovecot
# gives on startup when ssl_dh is unset. # gives on startup when ssl_dh is unset.
ssl_dh = </etc/dovecot/dh.pem ssl_dh = </usr/share/dovecot/dh.pem
# SSL protocols to use # SSL protocols to use
#ssl_protocols = !SSLv3 #ssl_protocols = !SSLv3
@@ -3327,7 +3327,6 @@ plugin {
</file> </file>
</files> </files>
<commands index="1"> <commands index="1">
<command><![CDATA[openssl dhparam -out /etc/dovecot/dh.pem 4096]]></command>
<command><![CDATA[service dovecot restart]]></command> <command><![CDATA[service dovecot restart]]></command>
</commands> </commands>
</general> </general>

4
lib/configfiles/gentoo.xml
View File

@@ -1986,7 +1986,7 @@ sql_select: SELECT password_enc FROM mail_users WHERE username='%u@%r' OR email=
<!-- Dovecot --> <!-- Dovecot -->
<daemon name="dovecot_postfix" version="2" title="Dovecot" <daemon name="dovecot_postfix" version="2" title="Dovecot"
default="true"> default="true">
<command><![CDATA[echo "net-mail/dovecot mysql managesieve sieve" >> /etc/portage/package.use/froxlor]]></command> <command><![CDATA[echo "net-mail/dovecot argon2 mysql managesieve sieve" >> /etc/portage/package.use/froxlor]]></command>
<install><![CDATA[emerge net-mail/dovecot]]></install> <install><![CDATA[emerge net-mail/dovecot]]></install>
<file name="/etc/dovecot/dovecot.conf" chown="root:root" <file name="/etc/dovecot/dovecot.conf" chown="root:root"
chmod="0640" backup="true"> chmod="0640" backup="true">
@@ -2341,7 +2341,7 @@ plugin {
]]> ]]>
</content> </content>
</file> </file>
<command><![CDATA[openssl dhparam -out /etc/dovecot/dh.pem 4096]]></command> <command><![CDATA[openssl dhparam -out /etc/dovecot/dh.pem 3072]]></command>
<command><![CDATA[rc-update add dovecot default]]></command> <command><![CDATA[rc-update add dovecot default]]></command>
<command><![CDATA[/etc/init.d/dovecot restart]]></command> <command><![CDATA[/etc/init.d/dovecot restart]]></command>
</daemon> </daemon>

3
lib/configfiles/jammy.xml
View File

@@ -2878,7 +2878,7 @@ ssl_key = <<SSL_KEY_FILE>
# Generate new params with `openssl dhparam -out /etc/dovecot/dh.pem 4096` # Generate new params with `openssl dhparam -out /etc/dovecot/dh.pem 4096`
# Or migrate from old ssl-parameters.dat file with the command dovecot # Or migrate from old ssl-parameters.dat file with the command dovecot
# gives on startup when ssl_dh is unset. # gives on startup when ssl_dh is unset.
ssl_dh = </etc/dovecot/dh.pem ssl_dh = </usr/share/dovecot/dh.pem
# SSL protocols to use # SSL protocols to use
@@ -3328,7 +3328,6 @@ plugin {
</file> </file>
</files> </files>
<commands index="1"> <commands index="1">
<command><![CDATA[openssl dhparam -out /etc/dovecot/dh.pem 4096]]></command>
<command><![CDATA[service dovecot restart]]></command> <command><![CDATA[service dovecot restart]]></command>
</commands> </commands>
</general> </general>