From 4e01cb2333acd997b01e6a10a9c447b1ccf520dc Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 21 Oct 2022 10:08:03 +0200 Subject: [PATCH] net/haproxy: remove _var_script use Commit message 27d89b85955c applies here as well. For now disable the new line until it is properly integrated. It could otherwise interfere with the way things are set up. PR: https://github.com/opnsense/core/issues/5917 --- .../src/opnsense/service/templates/OPNsense/HAProxy/rc.conf.d | 2 +- .../opnsense/service/templates/OPNsense/AcmeClient/rc.conf.d | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/rc.conf.d b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/rc.conf.d index 261881284..fdb9bcf37 100644 --- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/rc.conf.d +++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/rc.conf.d @@ -1,6 +1,6 @@ {% if helpers.exists('OPNsense.HAProxy.general.enabled') and OPNsense.HAProxy.general.enabled|default("0") == "1" %} haproxy_enable=YES -haproxy_var_script="/usr/local/opnsense/scripts/OPNsense/HAProxy/setup.sh" +#haproxy_setup="/usr/local/opnsense/scripts/OPNsense/HAProxy/setup.sh" haproxy_pidfile="/var/run/haproxy.pid" haproxy_config="/usr/local/etc/haproxy.conf" {% if helpers.exists('OPNsense.HAProxy.general.storeOcsp') and OPNsense.HAProxy.general.storeOcsp|default("0") == "1" %} diff --git a/security/acme-client/src/opnsense/service/templates/OPNsense/AcmeClient/rc.conf.d b/security/acme-client/src/opnsense/service/templates/OPNsense/AcmeClient/rc.conf.d index 96d20f1bc..6d1991e9d 100644 --- a/security/acme-client/src/opnsense/service/templates/OPNsense/AcmeClient/rc.conf.d +++ b/security/acme-client/src/opnsense/service/templates/OPNsense/AcmeClient/rc.conf.d @@ -2,7 +2,7 @@ acme_http_challenge_enable=YES acme_http_challenge_conf="/var/etc/lighttpd-acme-challenge.conf" acme_http_challenge_pidfile="/var/run/lighttpd-acme-challenge.pid" -acme_http_challenge_setup="/usr/local/opnsense/scripts/OPNsense/AcmeClient/setup.sh" +#acme_http_challenge_setup="/usr/local/opnsense/scripts/OPNsense/AcmeClient/setup.sh" {% else %} acme_http_challenge_enable=NO {% endif %}