Ready for Jessie (+ some improvements)
This commit is contained in:
@@ -163,33 +163,30 @@ sudo sed "s|<TPL:NGINX_LOCATION>|${url_path}|g" -i /var/www/vpnadmin/config.php
|
||||
|
||||
# Copy init script
|
||||
sudo install -o root -g root -m 0755 ../conf/ynh-vpnclient /usr/local/bin/
|
||||
sudo install -o root -g root -m 0755 ../conf/ynh-vpnclient.service /lib/systemd/system/ynh-vpnclient.service
|
||||
sudo install -o root -g root -m 0644 ../conf/ynh-vpnclient.service /etc/systemd/system/
|
||||
|
||||
# Set default inits
|
||||
# The openvpn configuration is modified before the start, so the service is disabled by default
|
||||
# and the ynh-vpnclient service handles it.
|
||||
sudo yunohost service add openvpn
|
||||
sudo yunohost service stop openvpn
|
||||
sudo yunohost service disable openvpn
|
||||
# The boot order of these services are important, so they are disabled by default
|
||||
# and the ynh-vpnclient service handles them.
|
||||
sudo systemctl disable openvpn
|
||||
sudo systemctl stop openvpn
|
||||
|
||||
sudo yunohost service add php5-fpm
|
||||
sudo yunohost service enable php5-fpm
|
||||
sudo systemctl enable php5-fpm
|
||||
sudo systemctl restart php5-fpm
|
||||
|
||||
sudo yunohost service add ynh-vpnclient
|
||||
sudo yunohost service enable ynh-vpnclient
|
||||
sudo systemctl start ynh-vpnclient --quiet
|
||||
sudo systemctl reload nginx
|
||||
|
||||
sudo systemctl reload nginx --quiet
|
||||
sudo systemctl enable ynh-vpnclient
|
||||
sudo systemctl start ynh-vpnclient
|
||||
|
||||
# Update SSO for vpnadmin
|
||||
sudo yunohost app ssowatconf
|
||||
|
||||
# Restart hotspot service if installed (and started) to change NAT configuration (now on tun0)
|
||||
# A new start will fix the interface without unsetting all stuff
|
||||
if [ -e /tmp/.ynh-hotspot-started ]; then
|
||||
sudo systemctl restart ynh-hotspot --quiet
|
||||
sudo systemctl restart dnsmasq --quiet
|
||||
fi
|
||||
#if [ -e /tmp/.ynh-hotspot-started ]; then
|
||||
# sudo ynh-hotspot start
|
||||
#fi
|
||||
|
||||
# Check configuration consistency
|
||||
|
||||
|
@@ -21,10 +21,9 @@
|
||||
domain=$(sudo yunohost app setting vpnclient domain)
|
||||
|
||||
# The End
|
||||
sudo systemctl stop ynh-vpnclient --quiet
|
||||
sudo systemctl disable ynh-vpnclient --quiet
|
||||
sudo yunohost service remove ynh-vpnclient
|
||||
sudo rm -f /lib/systemd/system/ynh-vpnclient.service /usr/local/bin/ynh-vpnclient
|
||||
sudo systemctl stop ynh-vpnclient
|
||||
sudo systemctl disable ynh-vpnclient
|
||||
sudo rm -f /etc/systemd/system/ynh-vpnclient.service /usr/local/bin/ynh-vpnclient
|
||||
sudo rm -f /tmp/.ynh-vpnclient-*
|
||||
|
||||
# Remove confs
|
||||
@@ -36,9 +35,8 @@ sudo rm -f /etc/php5/fpm/pool.d/vpnadmin.conf
|
||||
sudo rm -rf /etc/openvpn/keys/
|
||||
|
||||
# Restart services
|
||||
sudo yunohost service stop php5-fpm
|
||||
sudo yunohost service start php5-fpm
|
||||
sudo systemctl reload nginx --quiet
|
||||
sudo systemctl restart php5-fpm
|
||||
sudo systemctl reload nginx
|
||||
|
||||
# Remove sources
|
||||
sudo rm -rf /var/www/vpnadmin/
|
||||
|
Reference in New Issue
Block a user