Browse Source

emergency fix

with 
- 5654b6d0b266b14a5432bcd2f3e8428ef0f53ac9
- 081447008c7854ac3a1ae84e4e33eb112572b783
- a642a010291a010ee6d88ee6473fc34d1654d5a2
agentcobra 6 years ago
parent
commit
8b3a04fb90
2 changed files with 6 additions and 2 deletions
  1. 5 1
      conf/ynh-vpnclient
  2. 1 1
      scripts/install

+ 5 - 1
conf/ynh-vpnclient

@@ -129,6 +129,10 @@ start_openvpn() {
     [ "${ynh_server_proto}" == tcp ] && proto=tcp-client
   fi
 
+  # Unset firewall to let DNS and NTP resolution works
+  # Firewall is reset after vpn is mounted (more details on #1016)
+  unset_firewall
+
   sync_time
 
   cp /etc/openvpn/client.conf{.tpl,}
@@ -199,7 +203,7 @@ stop_openvpn() {
 
 sync_time() {
   systemctl stop ntp
-  ntpd -qg &> /dev/null
+  timeout 20 ntpd -qg &> /dev/null
   systemctl start ntp
 }
 

+ 1 - 1
scripts/install

@@ -33,7 +33,7 @@ fi
 ynh_webpath_register vpnclient $domain $url_path || exit 1
 
 # Install packages
-packages='php5-fpm sipcalc dnsutils openvpn curl'
+packages='php5-fpm sipcalc dnsutils openvpn curl fake-hwclock'
 export DEBIAN_FRONTEND=noninteractive
 
 sudo apt-get --assume-yes --force-yes install ${packages}