[git.ipfire.org] IPFire 2.x development tree branch, core120, updated. 39f4488a62cc97a1a60573e57eb8a14a7743f5e3

[git.ipfire.org] IPFire 2.x development tree branch, core120, updated. 39f4488a62cc97a1a60573e57eb8a14a7743f5e3

[git]

[-- Attachment #1: Type: text/plain, Size: 2729 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, core120 has been updated
       via  39f4488a62cc97a1a60573e57eb8a14a7743f5e3 (commit)
       via  ef623d3e68fdf97d2f96a5b9d1c22de771e05d49 (commit)
      from  196b9090f96064d5772e01b875106397a9c898da (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 39f4488a62cc97a1a60573e57eb8a14a7743f5e3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Apr 24 14:25:55 2018 +0100

    core120: Regenerate IPsec configuration
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit ef623d3e68fdf97d2f96a5b9d1c22de771e05d49
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Apr 19 15:36:37 2018 +0100

    Revert "IPsec: Try to restart always-on tunnels immediately"
    
    This reverts commit a261cb06c6cdd3ba14ad0163c8c9e714ae94fc5b.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/120/update.sh | 6 ++++++
 html/cgi-bin/vpnmain.cgi            | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/120/update.sh b/config/rootfiles/core/120/update.sh
index 1ba9df96f..c465d315b 100644
--- a/config/rootfiles/core/120/update.sh
+++ b/config/rootfiles/core/120/update.sh
@@ -83,6 +83,12 @@ done
 /etc/init.d/apache restart
 /etc/init.d/unbound restart
 
+# Regenerate IPsec configuration
+sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi
+if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
+	/etc/init.d/ipsec restart
+fi
+
 # Remove deprecated SSH configuration option
 sed -e "/UsePrivilegeSeparation/d" -i /etc/ssh/sshd_config
 
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index a52b4d64d..378acb326 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -436,12 +436,6 @@ sub writeipsecfiles {
 			if ($start_action eq 'route' && $inactivity_timeout > 0) {
 				print CONF "\tinactivity=$inactivity_timeout\n";
 			}
-
-			# Restart the connection immediately when it has gone down
-			# unexpectedly
-			if ($start_action eq 'start') {
-				print CONF "\tcloseaction=restart\n";
-			}
 		}
 
 		# Fragmentation


hooks/post-receive
--
IPFire 2.x development tree