local configuration should be separate

This commit is contained in:
Jack L. Frost 2014-04-04 15:40:00 +04:00
parent e1353f46cf
commit 99533f46c0
5 changed files with 8 additions and 13 deletions

View File

@ -3,10 +3,9 @@
unset reload unset reload
service_command='/usr/bin/cjdroute' service_command='/usr/bin/cjdroute'
cjdroute_config='/etc/cjdroute.conf' cjdroute_config='/etc/cjdroute.conf'
cjdroute_tun_interface='cjdns0'
cjdroute_listen_port='7530' source "${cfg_dir}/conf.d/cjdroute.sh"
service_pid=`lsof -i :"$cjdroute_listen_port" | tail -1 | cut -d ' ' -f 2` service_pid=`lsof -i :"$cjdroute_listen_port" | tail -1 | cut -d ' ' -f 2`

View File

@ -2,5 +2,6 @@
# dhcp client daemon initscript # dhcp client daemon initscript
service_command='/usr/sbin/dhcpcd' service_command='/usr/sbin/dhcpcd'
service_args='-q -C resolv.conf'
service_pidfile='/var/run/dhcpcd.pid' service_pidfile='/var/run/dhcpcd.pid'
source "${cfg_dir}/conf.d/dhcpcd.sh"

View File

@ -1,7 +0,0 @@
#!/usr/bin/env watchman
cfg_ovpn_instance="${service_name##*-}"
service_command="/usr/sbin/openvpn"
service_workdir="/etc/openvpn/$cfg_ovpn_instance"
service_args="client.cfg"

View File

@ -10,3 +10,5 @@ sshd_genkeys() {
[[ -e "/etc/ssh/ssh_host_key" ]] || { ssh-keygen -A; } [[ -e "/etc/ssh/ssh_host_key" ]] || { ssh-keygen -A; }
watchman.start watchman.start
} }
start() { sshd_genkeys; }

View File

@ -1,7 +1,6 @@
#!/usr/bin/env watchman #!/usr/bin/env watchman
service_command='/sbin/udevd' source "${cfg_dir}/conf.d/udev.sh"
# service_args='--resolve-names=never'
cfg_udev_settle_timeout="${cfg_udev_settle_timeout:-60}" cfg_udev_settle_timeout="${cfg_udev_settle_timeout:-60}"
@ -14,6 +13,7 @@ udev.populate_dev() {
watchman.msg "Waiting for uevents..." watchman.msg "Waiting for uevents..."
udevadm settle --timeout=${cfg_udev_settle_timeout} udevadm settle --timeout=${cfg_udev_settle_timeout}
udevadm control --property=do_not_run_plug_service=
} }
start() { start() {