moved crl-verify crl.pem to openvpn config templates

Author: Nethius

client/server_scripts/openvpn/configure_container.sh

@@ -18,6 +18,7 @@ user nobody
 group nobody
 persist-key
 persist-tun
+crl-verify crl.pem
 status openvpn-status.log
 verb 1
 tls-server

client/server_scripts/openvpn/template.ovpn

@@ -5,6 +5,7 @@ resolv-retry infinite
 nobind
 persist-key
 persist-tun
+crl-verify crl.pem
 $OPENVPN_NCP_DISABLE
 cipher $OPENVPN_CIPHER
 auth $OPENVPN_HASH

client/server_scripts/openvpn_cloak/configure_container.sh

@@ -18,6 +18,7 @@ user nobody
 group nobody
 persist-key
 persist-tun
+crl-verify crl.pem
 status openvpn-status.log
 verb 1
 tls-server

client/server_scripts/openvpn_cloak/template.ovpn

@@ -5,6 +5,7 @@ resolv-retry infinite
 nobind
 persist-key
 persist-tun
+crl-verify crl.pem
 $OPENVPN_NCP_DISABLE
 cipher $OPENVPN_CIPHER
 auth $OPENVPN_HASH

client/server_scripts/openvpn_shadowsocks/configure_container.sh

@@ -18,6 +18,7 @@ user nobody
 group nobody
 persist-key
 persist-tun
+crl-verify crl.pem
 status openvpn-status.log
 verb 1
 tls-server

client/server_scripts/openvpn_shadowsocks/template.ovpn

@@ -5,6 +5,7 @@ resolv-retry infinite
 nobind
 persist-key
 persist-tun
+crl-verify crl.pem
 $OPENVPN_NCP_DISABLE
 cipher $OPENVPN_CIPHER
 auth $OPENVPN_HASH

client/ui/pages_logic/ClientInfoLogic.cpp

@@ -125,6 +125,7 @@ void ClientInfoLogic::onRevokeOpenVpnCertificateClicked()
     auto error = m_serverController->runScript(credentials, script);
     if (isErrorOccured(error)) {
         set_busyIndicatorIsRunning(false);
+        emit uiLogic()->goToPage(Page::ServerSettings);
         return;
     }
 
@@ -136,14 +137,6 @@ void ClientInfoLogic::onRevokeOpenVpnCertificateClicked()
         return;
     }
 
-    error = m_serverController->uploadTextFileToContainer(container, credentials, "crl-verify crl.pem\n",
-                                                          protocols::openvpn::serverConfigPath,
-                                                          QSsh::SftpOverwriteMode::SftpAppendToExisting);
-    if (isErrorOccured(error)) {
-        set_busyIndicatorIsRunning(false);
-        return;
-    }
-
     const QJsonObject &containerConfig = m_settings->containerConfig(uiLogic()->selectedServerIndex, container);
     error = m_serverController->startupContainerWorker(credentials, container, containerConfig);
     if (isErrorOccured(error)) {

docs/openVpnRevokeClientCertificate.plantuml

@@ -12,7 +12,6 @@ cont -> cont: cd /opt/amnezia/openvpn
 cont -> cont: easyrsa revoke openvpnCertId
 cont -> cont: easyrsa gen-crl
 cont -> cont: cp pki/crl.pem crl.pem
-cont -> cont: add crl-verify crl.pem to server.conf
 cont -> ovpn: restart openvpn service
 note right
     In the OpenVpn config