diff options
| author | June McEnroe <june@causal.agency> | 2019-11-03 00:28:20 -0400 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2019-11-03 00:28:20 -0400 |
| commit | 831e2f1049fa64a5b5eed84c80361d45f32d5a81 (patch) | |
| tree | 9c3a74e7238cb6d18cd72636c8c1819f6294031e | |
| parent | Set procname in calico rc script (diff) | |
| download | pounce-831e2f1049fa64a5b5eed84c80361d45f32d5a81.tar.gz pounce-831e2f1049fa64a5b5eed84c80361d45f32d5a81.zip | |
Set up /var/run/calico and /usr/local/etc/pounce
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | rc.d/calico | 5 | ||||
| -rw-r--r-- | rc.d/pounce | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/Makefile b/Makefile index 5000038..a41d96d 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,8 @@ LDLIBS = -ltls BINS = calico pounce MANS = ${BINS:=.1} -RCS = ${BINS:%=rc.d/%} +RCS = ${BINS:%=rc.d/%} +DIRS = ${ETCDIR}/pounce /var/run/calico -include config.mk @@ -43,11 +44,13 @@ install: ${BINS} ${MANS} ${RCS} install ${BINS} ${PREFIX}/bin install -m 644 ${MANS} ${MANDIR}/man1 install ${RCS} ${ETCDIR}/rc.d + install -d -m 700 ${DIRS} uninstall: rm -f ${BINS:%=${PREFIX}/bin/%} rm -f ${MANS:%=${MANDIR}/man1/%} rm -f ${RCS:%=${ETCDIR}/%} + rmdir ${DIRS} localhost.crt: printf "[dn]\nCN=localhost\n[req]\ndistinguished_name=dn\n[EXT]\nsubjectAltName=DNS:localhost\nkeyUsage=digitalSignature\nextendedKeyUsage=serverAuth" \ diff --git a/rc.d/calico b/rc.d/calico index 6d5b022..32c21d8 100644 --- a/rc.d/calico +++ b/rc.d/calico @@ -11,11 +11,14 @@ rcvar='calico_enable' load_rc_config "${name}" -: ${calico_enable:="NO"} +: ${calico_enable:='NO'} +: ${calico_path:="/var/run/${name}"} +calico_flags="${calico_flags} ${calico_path}" command='/usr/sbin/daemon' procname='/usr/local/bin/calico' pidfile="/var/run/${name}.pid" +required_dirs=$calico_path child_flags=$calico_flags child_user=$calico_user diff --git a/rc.d/pounce b/rc.d/pounce index 599c585..9777fda 100644 --- a/rc.d/pounce +++ b/rc.d/pounce @@ -13,11 +13,13 @@ sig_reload='USR1' load_rc_config "${name}" -: ${pounce_enable:="NO"} +: ${pounce_enable:='NO'} +: ${pounce_chdir:="/usr/local/etc/${name}"} command='/usr/sbin/daemon' pidprefix="/var/run/${name}" pidfile="${pidprefix}.pid" +required_dirs=$pounce_chdir child_command='/usr/local/bin/pounce' child_pidfile="${pidprefix}.child.pid" @@ -29,6 +31,7 @@ if [ -n "$2" ]; then child_pidfile="${pidprefix}.${profile}.child.pid" eval pounce_enable="\${pounce_${profile}_enable:-${pounce_enable}}" eval pounce_flags="\${pounce_${profile}_flags:-${pounce_flags}}" + eval pounce_chdir="\${pounce_${profile}_chdir:-${pounce_chdir}}" eval pounce_user="\${pounce_${profile}_user:-${pounce_user}}" else echo "$0: extra argument ignored" |