Skip to content
This repository was archived by the owner on Jan 27, 2024. It is now read-only.

Commit 865dc01

Browse files
author
Shawn Iverson
authored
Merge pull request #394 from E-F-A/3.0.2.5
3.0.2.5
2 parents 2fd4076 + 0fdf925 commit 865dc01

File tree

13 files changed

+142
-58
lines changed

13 files changed

+142
-58
lines changed

‎CHANGELOG‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,15 @@ EFA Version 3.0.2.5 Changes
55
Issue #324 Enhancement - Import external backup to new EFA device
66
Issue #361 Enhancement - Display EFA version in the CLI via EFA-Configure
77
Issue #385 Bug - Changed from reload to restart for Postfix
8+
Issue #386 Bug - Admin cannot modify domain admin accounts
89
Issue #387 Enhancement - Updated MariaDB recovery script
910

1011
Enhancement - Let's Encrypt
1112
Enhancement - Add EFA sponsored DCC servers
1213
Enhancement - Hypervisor detection during init
14+
Enhancement - MailScanner update to 5.0.6-5
15+
Enhancement - MailWatch updated to latest develop
16+
Enhancement - clamav-unofficial-sigs updated to 5.6.2
1317
Security - Regenerate self signed certs for Postfix/Apache/Webmin
1418
Security - Enabled strong cipher preference in Postfix
1519
Security - Enabled strong cipher preference in Apache

‎RELEASENOTES‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
######################################################################
2-
# EFA 3.0.2.4 RELEASE NOTES
2+
# EFA 3.0.2.5 RELEASE NOTES
33
######################################################################
44
# Copyright (C) 2015-2017 https://efa-project.org
55
#
@@ -17,17 +17,17 @@
1717
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
#######################################################################
1919

20-
Welcome to EFA Version 3.0.2.4!
20+
Welcome to EFA Version 3.0.2.5!
2121

2222
Many thanks goes to the developers of EFA and maintainers of all
2323
3rd party packages!
2424

25-
These release notes will help guide you through the 3.0.2.4 update.
25+
These release notes will help guide you through the 3.0.2.5 update.
2626

2727
Many fixes and enhancements have been made to EFA. Please review the
2828
CHANGELOG for further information.
2929

30-
https://raw.githubusercontent.com/E-F-A/v3/3.0.2.4/CHANGELOG
30+
https://raw.githubusercontent.com/E-F-A/v3/3.0.2.5/CHANGELOG
3131

3232
###################### How To Update ##################################
3333

@@ -49,7 +49,7 @@ Choose option 14) Update Now
4949
The first time you run this update, the kernel may update. If this
5050
happens, the script will halt to give you an opportunity to restart.
5151
After restarting and booting to the new kernel, rerun EFA-Update to
52-
continue the update process to 3.0.2.4.
52+
continue the update process to 3.0.2.5.
5353

5454
EFA-Update will not proceed until you are running on the latest
5555
kernel. This is to ensure that open-vm-tools updates appropriately
@@ -69,7 +69,7 @@ elevate and downgrade privileges of other admins and domain admins.
6969
################ Important Info -- Custom Tweaks ######################
7070

7171
Many EFA users have modified their EFA installations and made tweaks
72-
that may "disappear" after an update to 3.0.2.4.
72+
that may "disappear" after an update to 3.0.2.5.
7373

7474
Updated files have been automatically backed up to the following
7575
location:
@@ -81,8 +81,8 @@ location:
8181
########################## Known Issues ###############################
8282

8383
1) If you are running commercial VMware-Tools, open-vm-tools may
84-
install itself after updating to 3.0.2.4. Reapply VMware-Tools
85-
after updating to 3.0.2.4. Run the following command to remove
84+
install itself after updating to 3.0.2.5. Reapply VMware-Tools
85+
after updating to 3.0.2.5. Run the following command to remove
8686
open-vm-tools:
8787

8888
sudo rpm -e open-vm-tools

‎TESTPLAN‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,19 @@ EFA Version 3.0.2.5 TEST PLAN
33
############################################################
44

55
Confirm certbot gets installed PASSED
6-
Confirm DCC servers get update PASSED
6+
Confirm EFA-Configure DCC Server option PASSED
77
Confirm postfix hardening occurs PASSED
88
Confirm Apache hardening occurs PASSED
99
Confrim enabling Let's Encrypt works (apache/postfix/webmin) PASSED
1010
Confirm disabling Let's Encrypt places self-signed certs back (apache/postfix/webmin) PASSED
1111
Confrim upgrade from 3.0.2.4 -> 3.0.2.5 starts new cert regen (change self-signed from SHA1 to SHA256) PASSED
1212
Confirm new buils detect hypervisor and installs agent accordingly PASSED
13+
Confirm successful update to latest MailWatch PASSED
14+
Confirm successful update to latest MailScanner PASSED
15+
Confirm successful update to latest clamav-unofficial-sigs PASSED
16+
Confirm msre_reload cron symlinked properly PASSED
1317

18+
Todo: build testing
1419

1520
############################################################
1621
EFA Version 3.0.2.4 TEST PLAN

‎build/EFA/EFA-Configure‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ shopt -s extglob
5959
. /var/EFA/lib/EFA-Configure/func_maintenance
6060
. /var/EFA/lib/EFA-Configure/func_peruser
6161
. /var/EFA/lib/EFA-Configure/func_letsencrypt
62+
. /var/EFA/lib/EFA-Configure/func_askdccservers
6263

6364
# +---------------------------------------------------+
6465

‎build/EFA/EFA-Init‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -952,6 +952,9 @@ function func_configure-system() {
952952
randompw
953953
MUNINPWD=$PASSWD
954954
htpasswd -b /etc/munin/munin-htpasswd munin $MUNINPWD
955+
956+
# Add nova53.net dcc server
957+
/usr/local/bin/cdcc "add dcc.nova53.net"
955958

956959
# Issue 322 Geoip update during EFA-Init
957960
/usr/bin/php /usr/local/sbin/geoip_update_cmd.php
@@ -1072,6 +1075,7 @@ function func_end() {
10721075
else
10731076
echo "AUTOUPDATES:DISABLED" >> /etc/EFA-Config
10741077
fi
1078+
echo "DCCPOOL:default" >> /etc/EFA-Config
10751079

10761080
sed -i "/CONFIGURED:/ c\CONFIGURED:YES" /etc/EFA-Config
10771081

‎build/EFA/lib-EFA-Configure/func_askdccservers‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
# +---------------------------------------------------+
2+
# Function to ask and set DCC Server Pool
3+
# +---------------------------------------------------+
4+
5+
function func_ask-dccservers() {
6+
func_echo-header
7+
echo -e "$green[EFA]$clean - Set DCC Server Pools"
8+
echo -e ""
9+
echo -e "$green[EFA]$clean This option will allow you to set the DCC server"
10+
echo -e "$green[EFA]$clean pools that you want to use."
11+
echo -e "$green[EFA]$clean The default pool includes dcc limited use servers and nova53.net"
12+
echo -e "$green[EFA]$clean The nova53.net pool is free for unlimited use for EFA users."
13+
echo -e "$green[EFA]$clean The dcc-servers.net pool is limited use and what ships with dcc."
14+
echo -e "$green[EFA]$clean Choice of pool may affect performance, depending on your location"
15+
echo -e ""
16+
DCCPOOL=$(grep DCCPOOL /etc/EFA-Config | sed -e 's/.*://')
17+
echo -e "Current DCC Pool: $DCCPOOL"
18+
echo -e ""
19+
20+
while [ "1" == "1" ]
21+
do
22+
echo -e "Choose an option:"
23+
echo -e "1) Use default pool (both)"
24+
echo -e "2) Use nova53.net pool"
25+
echo -e "3) Use dccservers pool"
26+
echo -e ""
27+
echo -e "e) Return to main menu"
28+
echo -e ""
29+
echo -e -n "$green[EFA]$clean : "
30+
local choice
31+
read choice
32+
case $choice in
33+
1)
34+
cleardcc
35+
/usr/local/bin/cdcc "add dcc1.dcc-servers.net"
36+
/usr/local/bin/cdcc "add dcc2.dcc-servers.net"
37+
/usr/local/bin/cdcc "add dcc3.dcc-servers.net"
38+
/usr/local/bin/cdcc "add dcc4.dcc-servers.net"
39+
/usr/local/bin/cdcc "add dcc5.dcc-servers.net"
40+
/usr/local/bin/cdcc "add dcc.nova53.net"
41+
sed -i '/^DCCPOOL:/ c\DCCPOOL:default' /etc/EFA-Config
42+
echo -e "$green[EFA]$clean DCC Pool set to default"
43+
sleep 5
44+
return ;;
45+
2)
46+
cleardcc
47+
/usr/local/bin/cdcc "add dcc1.nova53.net"
48+
/usr/local/bin/cdcc "add dcc2.nova53.net"
49+
/usr/local/bin/cdcc "add dcc3.nova53.net"
50+
/usr/local/bin/cdcc "add dcc4.nova53.net"
51+
sed -i '/^DCCPOOL:/ c\DCCPOOL:nova53.net' /etc/EFA-Config
52+
echo -e "$green[EFA]$clean DCC Pool set to nova53.net"
53+
sleep 2
54+
return ;;
55+
3)
56+
cleardcc
57+
/usr/local/bin/cdcc "add dcc1.dcc-servers.net"
58+
/usr/local/bin/cdcc "add dcc2.dcc-servers.net"
59+
/usr/local/bin/cdcc "add dcc3.dcc-servers.net"
60+
/usr/local/bin/cdcc "add dcc4.dcc-servers.net"
61+
/usr/local/bin/cdcc "add dcc5.dcc-servers.net"
62+
sed -i '/^DCCPOOL:/ c\DCCPOOL:dcc-servers.net' /etc/EFA-Config
63+
echo -e "$green[EFA]$clean DCC Pool set to dcc-servers.net"
64+
sleep 2
65+
return ;;
66+
e) return ;;
67+
*) echo -e "Error \"$choice\" is not an option..." && sleep 2
68+
esac
69+
done
70+
}
71+
72+
73+
function cleardcc() {
74+
/usr/local/bin/cdcc "delete dcc.nova53.net" >/dev/null 2&>1
75+
/usr/local/bin/cdcc "delete dcc1.nova53.net" >/dev/null 2&>1
76+
/usr/local/bin/cdcc "delete dcc2.nova53.net" >/dev/null 2&>1
77+
/usr/local/bin/cdcc "delete dcc3.nova53.net" >/dev/null 2&>1
78+
/usr/local/bin/cdcc "delete dcc4.nova53.net" >/dev/null 2&>1
79+
/usr/local/bin/cdcc "delete dcc1.dcc-servers.net" >/dev/null 2&>1
80+
/usr/local/bin/cdcc "delete dcc2.dcc-servers.net" >/dev/null 2&>1
81+
/usr/local/bin/cdcc "delete dcc3.dcc-servers.net" >/dev/null 2&>1
82+
/usr/local/bin/cdcc "delete dcc4.dcc-servers.net" >/dev/null 2&>1
83+
/usr/local/bin/cdcc "delete dcc5.dcc-servers.net" >/dev/null 2&>1
84+
}

‎build/EFA/lib-EFA-Configure/func_spamsettings‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ function func_spam-settings() {
1717
echo -e "6) Mailwatch sa-learn Max Message Size"
1818
echo -e "7) Mailwatch hide high spam/mcp"
1919
echo -e "8) MalwarePatrol Key Code"
20+
echo -e "9) DCC Servers"
2021
echo -e ""
2122
echo -e "e) Return to main menu"
2223
echo -e ""
@@ -32,6 +33,7 @@ function func_spam-settings() {
3233
6) func_ask-maxsizemailwatch;;
3334
7) func_ask-highspammailwatch;;
3435
8) func_ask-malwarepatrol;;
36+
9) func_ask-dccservers;;
3537
e) menu=1 && return ;;
3638
*) echo -e "Error \"$choice\" is not an option..." && sleep 2
3739
esac

‎build/EFA/lib-EFA-Configure/libraries-filelist.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@ func_retention
2929
func_maintenance
3030
func_peruser
3131
func_letsencrypt
32+
func_askdccservers

‎build/build.bash‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ mirror="http://dl.efa-project.org"
3333
smirror="https://dl.efa-project.org"
3434
mirrorpath="/build/$version"
3535
yumexclude="kernel* MariaDB* postfix* mailscanner* MailScanner* clamav* clamd* open-vm-tools* qemu-guest-agent*"
36-
MAILWATCHVERSION="c08ef03"
36+
MAILWATCHVERSION="7f70aa3"
3737
MAILWATCHRELEASE="1.2.7-dev"
3838
MAILWATCHBRANCH="develop"
3939
IMAGECEBERUSVERSION="1.1"
@@ -583,7 +583,7 @@ func_apache () {
583583
mkdir /etc/pki/tls/backup
584584
mv /etc/pki/tls/certs/localhost.crt /etc/pki/tls/backup
585585
mv /etc/pki/tls/private/localhost.key /etc/pki/tls/backup
586-
mv /etc/pki/tls/certs/server-chain.crt /etc/pki/tls/backup
586+
# mv /etc/pki/tls/certs/server-chain.crt /etc/pki/tls/backup
587587

588588
# use postfix cert
589589
ln -s /etc/postfix/ssl/rsa_smtpd.pem /etc/pki/tls/certs/localhost.crt
@@ -908,7 +908,8 @@ EOF
908908
chgrp -R apache /etc/MailScanner/rules
909909
chmod g+rwxs /etc/MailScanner/rules
910910
chmod g+rw /etc/MailScanner/rules/*.rules
911-
ln -s /usr/local/bin/mailwatch/tools/Cron_jobs/msre_reload.crond /etc/cron.d/msre_reload.crond
911+
# Issue #393 fix msre_reload.sh symlink to new location
912+
ln -s /usr/local/bin/mailwatch/tools/MailScanner_rule_editor/msre_reload.crontab /etc/cron.d/msre_reload.crond
912913
ln -s /usr/local/bin/mailwatch/tools/MailScanner_rule_editor/msre_reload.sh /usr/local/bin/msre_reload.sh
913914
chmod ugo+x /usr/local/bin/mailwatch/tools/MailScanner_rule_editor/msre_reload.sh
914915

@@ -1146,14 +1147,6 @@ func_dcc () {
11461147

11471148
cp /var/dcc/libexec/rcDCC /etc/init.d/adcc
11481149
sed -i "s/#loadplugin Mail::SpamAssassin::Plugin::DCC/loadplugin Mail::SpamAssassin::Plugin::DCC/g" /etc/mail/spamassassin/v310.pre
1149-
1150-
#remove old servers
1151-
/usr/local/bin/cdcc "delete dcc.nova53.net" >/dev/null 2>&1
1152-
#add new EFA servers
1153-
/usr/local/bin/cdcc "add dcc1.nova53.net"
1154-
/usr/local/bin/cdcc "add dcc2.nova53.net"
1155-
/usr/local/bin/cdcc "add dcc3.nova53.net"
1156-
/usr/local/bin/cdcc "add dcc4.nova53.net"
11571150
}
11581151
# +---------------------------------------------------+
11591152

‎build/ks.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ openssl-devel
193193
%post
194194
mkdir /var/log/EFA
195195
mkdir /usr/src/EFA
196-
/usr/bin/wget -q -O /usr/src/EFA/build.bash -o /var/log/EFA/wget.log https://raw.githubusercontent.com/E-F-A/v3/3.0.2.4/build/build.bash --no-check-certificate
196+
/usr/bin/wget -q -O /usr/src/EFA/build.bash -o /var/log/EFA/wget.log https://raw.githubusercontent.com/E-F-A/v3/3.0.2.5/build/build.bash --no-check-certificate
197197
chmod 700 /usr/src/EFA/build.bash
198198
logsave /var/log/EFA/build.log /usr/src/EFA/build.bash
199199
%end

0 commit comments

Comments
 (0)