diff --git a/dns/cascade/Makefile b/dns/cascade/Makefile index 1ea867def137..20dd73470787 100644 --- a/dns/cascade/Makefile +++ b/dns/cascade/Makefile @@ -1,46 +1,46 @@ PORTNAME= cascade DISTVERSION= 0.1.0-RC1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= dns net PKGNAMESUFFIX= -dns MAINTAINER= bofh@FreeBSD.org COMMENT= Friendly DNSSEC signing solution WWW= https://github.com/NLnetLabs/cascade LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= dnst:dns/dnst USES= cargo cpe ssl CPE_VENDOR= nlnetlabs USE_GITHUB= yes GH_ACCOUNT= NLnetLabs GH_TAGNAME= 07ba70c2e USE_RC_SUBR= ${PORTNAME} SUB_LIST= USERS=${USERS} \ GROUPS=${GROUPS} \ DBDIR=${DBDIR} USERS= ${PORTNAME} GROUPS= ${PORTNAME} PLIST_SUB+= USERS=${USERS} \ GROUPS=${GROUPS} DBDIR= /var/db/${PORTNAME} post-patch: @${REINPLACE_CMD} -e 's|%%ETCDIR%%|${ETCDIR}|g; \ s|%%DBDIR%%|${DBDIR}|g; \ s|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/etc/config.template.toml post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/etc/policy.template.toml ${STAGEDIR}${ETCDIR}/policy.toml.sample ${INSTALL_DATA} ${WRKSRC}/etc/config.template.toml ${STAGEDIR}${ETCDIR}/config.toml.sample .include diff --git a/dns/cascade/files/cascade.in b/dns/cascade/files/cascade.in index 902474211f94..8f7af3897bfa 100644 --- a/dns/cascade/files/cascade.in +++ b/dns/cascade/files/cascade.in @@ -1,49 +1,54 @@ #!/bin/sh # # PROVIDE: cascade # REQUIRE: LOGIN networking # KEYWORD: shutdown # # cascade_enable (bool): # Default value: "NO" # Flag that determines whether cascade is enabled # # cascade_config (string) # Default value %%ETCDIR%%/config.toml # Path to the cascade configuration file # +# cascade_state (string) +# Default value %%DBDIR%%/state.db +# Path to file where cascade should store its global state +# # cascade_user (string) # This is the user that cascade runs as # Set to %%USERS%% by default # # cascade_group (string) # This is the group that cascade runs as # Set to %%GROUPS%% by default . /etc/rc.subr name=cascade rcvar=cascade_enable load_rc_config $name : ${cascade_enable:="NO"} : ${cascade_config:="%%ETCDIR%%/config.toml"} +: ${cascade_state:="%%DBDIR%%/state.db"} : ${cascade_user:=%%USERS%%} : ${cascade_group:=%%GROUPS%%} command="%%PREFIX%%/bin/cascaded" -command_args="--config ${cascade_config} --daemonize" +command_args="--config ${cascade_config} --state ${cascade_state} --daemonize" start_precmd="cascade_checkconf" restart_precmd="cascade_checkconf" configtest_cmd="cascade_checkconf" extra_commands="configtest" required_files="${cascade_config}" cascade_checkconf() { ${command} --config ${cascade_config} --check-config } run_rc_command "$1"