diff --git a/APP_PROFILER/services/generator.py b/APP_PROFILER/services/generator.py index 350054d..09257b1 100644 --- a/APP_PROFILER/services/generator.py +++ b/APP_PROFILER/services/generator.py @@ -23,6 +23,7 @@ def generate_server_config(db: Session, output_path: str = "server.conf"): file_srv_key_path = os.path.join(PKI_DIR, "private", f"{pki_settings.fqdn_server}.key") file_dh_path = os.path.join(PKI_DIR, "dh.pem") file_ta_path = os.path.join(PKI_DIR, "ta.key") + file_crl_path = os.path.join(PKI_DIR, "crl.pem") # Render template config_content = template.render( @@ -33,6 +34,7 @@ def generate_server_config(db: Session, output_path: str = "server.conf"): srv_key_path=file_srv_key_path, dh_path=file_dh_path, ta_path=file_ta_path, + crl_path=file_crl_path, vpn_network=settings.vpn_network, vpn_netmask=settings.vpn_netmask, tunnel_type=settings.tunnel_type, diff --git a/APP_PROFILER/templates/server.conf.j2 b/APP_PROFILER/templates/server.conf.j2 index e06c6fa..3effa7a 100644 --- a/APP_PROFILER/templates/server.conf.j2 +++ b/APP_PROFILER/templates/server.conf.j2 @@ -28,8 +28,8 @@ server {{ vpn_network }} {{ vpn_netmask }} ifconfig-pool-persist /etc/openvpn/ipp.txt -log /var/log/openvpn/openvpn-status.log -log-append /var/log/openvpn/openvpn-status.log +log /var/log/openvpn/openvpn.log +log-append /var/log/openvpn/openvpn.log verb 3 @@ -84,7 +84,7 @@ persist-tun # check revocation list {% if crl_verify %} -crl-verify /etc/openvpn/crl.pem +crl-verify {{ crl_path }} {% else %} # crl-verify disabled {% endif %}