Don't hardcode server.conf in systemd service

This commit is contained in:
angristan 2018-09-17 15:13:48 +02:00
parent 6210c64d10
commit f75b330561

View file

@ -791,10 +791,9 @@ verb 3" >> /etc/openvpn/server.conf
#Workaround to fix OpenVPN service on OpenVZ #Workaround to fix OpenVPN service on OpenVZ
sed -i 's|LimitNPROC|#LimitNPROC|' /lib/systemd/system/openvpn\@.service sed -i 's|LimitNPROC|#LimitNPROC|' /lib/systemd/system/openvpn\@.service
sed -i 's|/etc/openvpn/server|/etc/openvpn|' /lib/systemd/system/openvpn\@.service sed -i 's|/etc/openvpn/server|/etc/openvpn|' /lib/systemd/system/openvpn\@.service
sed -i 's|%i.conf|server.conf|' /lib/systemd/system/openvpn\@.service
systemctl daemon-reload systemctl daemon-reload
systemctl restart openvpn systemctl restart openvpn@server
systemctl enable openvpn systemctl enable openvpn@server
else else
/etc/init.d/openvpn restart /etc/init.d/openvpn restart
fi fi
@ -803,13 +802,12 @@ verb 3" >> /etc/openvpn/server.conf
if [[ "$OS" = 'fedora' ]]; then if [[ "$OS" = 'fedora' ]]; then
# Workaround to avoid rewriting the entire script for Fedora # Workaround to avoid rewriting the entire script for Fedora
sed -i 's|/etc/openvpn/server|/etc/openvpn|' /usr/lib/systemd/system/openvpn-server@.service sed -i 's|/etc/openvpn/server|/etc/openvpn|' /usr/lib/systemd/system/openvpn-server@.service
sed -i 's|%i.conf|server.conf|' /usr/lib/systemd/system/openvpn-server@.service
systemctl daemon-reload systemctl daemon-reload
systemctl restart openvpn-server@openvpn.service systemctl restart openvpn-server@openvpn
systemctl enable openvpn-server@openvpn.service systemctl enable openvpn-server@openvpn
else else
systemctl restart openvpn@server.service systemctl restart openvpn@server
systemctl enable openvpn@server.service systemctl enable openvpn@server
fi fi
else else
service openvpn restart service openvpn restart