system: for consistency add -c argument (the default) to pluginctl invokes

Some facilities might overlap in naming so make it less confusing from
the internal scripting side. "webproxy" had me doubting for a second.
This commit is contained in:
Franco Fichtner 2022-08-31 09:18:31 +02:00
parent c1ff59ea02
commit 7607a6d968
6 changed files with 17 additions and 17 deletions

View File

@ -340,7 +340,7 @@ upgrade-check:
upgrade: upgrade-check clean-pkgdir package
@${PKG} delete -fy ${CORE_NAME} || true
@${PKG} add ${PKGDIR}/*.pkg
@${.CURDIR}/src/sbin/pluginctl webgui
@${.CURDIR}/src/sbin/pluginctl -c webgui
lint-shell:
@find ${.CURDIR}/src ${.CURDIR}/Scripts \

View File

@ -1,11 +1,11 @@
[user.changed]
command:/usr/local/sbin/pluginctl
parameters: -c user_changed %s
command:/usr/local/sbin/pluginctl -c user_changed
parameters:%s
type:script
message: User %s changed
message:user %s changed
[add.user]
command:/usr/local/opnsense/scripts/auth/add_user.php
parameters: -u %s
command:/usr/local/opnsense/scripts/auth/add_user.php -u
parameters:%s
type:script_output
message: Add user %s
message:add user %s

View File

@ -11,7 +11,7 @@ type:script
message:update IPv6 prefixes
[restart]
command:/usr/local/sbin/pluginctl dhcp
command:/usr/local/sbin/pluginctl -c dhcp
parameters:%s
type:script
message:restarting %s dhcpd

View File

@ -53,7 +53,7 @@ type:script_output
message:request IPsec status
[start]
command:/usr/local/sbin/pluginctl ipsec
command:/usr/local/sbin/pluginctl -c ipsec
parameters:
type:script
message:IPsec service start
@ -65,7 +65,7 @@ type:script
message:IPsec service stop
[restart]
command:/usr/local/sbin/ipsec stop; /usr/local/sbin/pluginctl ipsec
command:/usr/local/sbin/ipsec stop; /usr/local/sbin/pluginctl -c ipsec
parameters:
type:script
message:IPsec service restart

View File

@ -1,5 +1,5 @@
[configure]
command:/usr/local/sbin/pluginctl
command:/usr/local/sbin/pluginctl -c
parameters:%s %s
type:script
message:Running plugin configuration %s %s

View File

@ -1,6 +1,6 @@
[start]
command:
/usr/local/sbin/pluginctl webproxy start;
/usr/local/sbin/pluginctl -c webproxy start;
/usr/local/etc/rc.d/squid start 2>&1 && echo "__ok__"; exit 0
parameters:
type:script_output
@ -10,7 +10,7 @@ message:starting proxy
command:
/usr/local/etc/rc.d/squid stop;
/usr/bin/killall squid;
/usr/local/sbin/pluginctl webproxy stop;
/usr/local/sbin/pluginctl -c webproxy stop;
exit 0
parameters:
type:script
@ -18,7 +18,7 @@ message:stopping proxy
[restart]
command:
/usr/local/sbin/pluginctl webproxy restart;
/usr/local/sbin/pluginctl -c webproxy restart;
/usr/local/etc/rc.d/squid restart 2>&1 && echo "__ok__"; exit 0
parameters:
type:script_output
@ -30,7 +30,7 @@ command:
/usr/bin/killall -9 squid;
rm /var/run/squid/squid.pid;
rm -rf /var/squid/*;
/usr/local/sbin/pluginctl webproxy start;
/usr/local/sbin/pluginctl -c webproxy start;
/usr/local/etc/rc.d/squid start
parameters:
type:script
@ -38,7 +38,7 @@ message:reset and restart proxy
[reload]
command:
/usr/local/sbin/pluginctl webproxy reload;
/usr/local/sbin/pluginctl -c webproxy reload;
/usr/local/opnsense/scripts/proxy/deploy_error_pages.py;
/usr/local/etc/rc.d/squid reload
parameters:
@ -54,7 +54,7 @@ message:request proxy status
[fetchacls]
command:
/usr/local/bin/flock -n -E 0 -o /tmp/fetchACLs.lock /usr/local/opnsense/scripts/proxy/fetchACLs.py && (
/usr/local/sbin/pluginctl webproxy reload;
/usr/local/sbin/pluginctl -c webproxy reload;
/usr/local/etc/rc.d/squid reload
)
parameters: