From 49ff4c940678884bced22581d191146249e78b6d Mon Sep 17 00:00:00 2001 From: Robin Davies Date: Fri, 22 Apr 2022 03:22:20 -0400 Subject: [PATCH] DHCP Fixes. --- src/templates/30-pipedal-p2p.conf | 2 +- src/templates/jack.service.template | 2 ++ src/templates/pipedal_p2pd.service.template | 2 +- src/templates/pipedaladmind.service.template | 1 + src/templates/pipedald.service.template | 1 - submodules/pipedal_p2pd | 2 +- 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/templates/30-pipedal-p2p.conf b/src/templates/30-pipedal-p2p.conf index 37457e6..a5d42ae 100644 --- a/src/templates/30-pipedal-p2p.conf +++ b/src/templates/30-pipedal-p2p.conf @@ -3,7 +3,7 @@ server=8.8.4.4 interface=p2p-wlan0-0 - dhcp-range=p2p-wlan0,173.23.0.3,172.23.0.127,1h + dhcp-range=172.23.0.3,172.23.0.127,15m domain=local address=/pipedal.local/172.23.0.2 diff --git a/src/templates/jack.service.template b/src/templates/jack.service.template index 44e7016..5ccd2f2 100644 --- a/src/templates/jack.service.template +++ b/src/templates/jack.service.template @@ -15,6 +15,8 @@ User=jack Group=audio Restart=always RestartSec=30 +TimeoutStopSec=30 + Environment=JACK_PROMISCUOUS_SERVER=audio Environment=JACK_NO_AUDIO_RESERVATION=1 diff --git a/src/templates/pipedal_p2pd.service.template b/src/templates/pipedal_p2pd.service.template index 749ec81..5b6b7a3 100644 --- a/src/templates/pipedal_p2pd.service.template +++ b/src/templates/pipedal_p2pd.service.template @@ -6,7 +6,7 @@ After=network.target ExecStart=${COMMAND} --systemd --log-level debug Type=notify WorkingDirectory=/var/pipedal -TimeOutStopSec=5 +TimeoutStopSec=5 [Install] diff --git a/src/templates/pipedaladmind.service.template b/src/templates/pipedaladmind.service.template index 57ef089..9f7e5e7 100644 --- a/src/templates/pipedaladmind.service.template +++ b/src/templates/pipedaladmind.service.template @@ -7,6 +7,7 @@ ExecStart=${COMMAND} Restart=always RestartSec=60 WorkingDirectory=/var/pipedal +TimeoutStopSec=15 [Install] diff --git a/src/templates/pipedald.service.template b/src/templates/pipedald.service.template index 6196d99..49ad27e 100644 --- a/src/templates/pipedald.service.template +++ b/src/templates/pipedald.service.template @@ -17,7 +17,6 @@ Group=pipedal_d Restart=always TimeoutStartSec=60 RestartSec=25 -TimeoutStopSec=10 WorkingDirectory=/var/pipedal Environment=JACK_PROMISCUOUS_SERVER=audio Environment=JACK_NO_AUDIO_RESERVATION=1 diff --git a/submodules/pipedal_p2pd b/submodules/pipedal_p2pd index d5d321e..0201528 160000 --- a/submodules/pipedal_p2pd +++ b/submodules/pipedal_p2pd @@ -1 +1 @@ -Subproject commit d5d321ea259255ce0057433b88e095d3bd6808db +Subproject commit 02015285d7a8c0a27b57040bb2a6bb6442f3d916