diff options
author | Andrew Cady <d@jerkface.net> | 2023-05-31 16:03:04 -0400 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2023-05-31 16:03:04 -0400 |
commit | f4d917d6310784ca5908f836a15ea7477c219ab6 (patch) | |
tree | 82e714d1936f8b546465f2a7a6c3683c793c2ea2 | |
parent | fa35bae311790d72bfd03e1ac4473ec9fc2e8fd6 (diff) |
simplify; remove commented out code and unused dependency
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | src/fossil-test@.service | 7 |
2 files changed, 2 insertions, 7 deletions
@@ -45,7 +45,7 @@ unit_files = $(addprefix src/fossil-user,@.service .socket) src/fossil-test@.ser | |||
45 | units = $(filter-out %@.service,$(notdir $(unit_files))) | 45 | units = $(filter-out %@.service,$(notdir $(unit_files))) |
46 | executables = src/endofossil | 46 | executables = src/endofossil |
47 | bindir = /usr/local/bin | 47 | bindir = /usr/local/bin |
48 | dependencies = socat fossil ssh fakeroot libnss-systemd | 48 | dependencies = socat fossil ssh fakeroot |
49 | 49 | ||
50 | SSH_USERNAME != if [ "$$SUDO_USER" ]; then echo "$$SUDO_USER"; else id -u; fi | 50 | SSH_USERNAME != if [ "$$SUDO_USER" ]; then echo "$$SUDO_USER"; else id -u; fi |
51 | 51 | ||
diff --git a/src/fossil-test@.service b/src/fossil-test@.service index c7076c4..23fdbd8 100644 --- a/src/fossil-test@.service +++ b/src/fossil-test@.service | |||
@@ -5,17 +5,12 @@ Description = Endofossil Test: Clone over SSH using fresh identity | |||
5 | Type = oneshot | 5 | Type = oneshot |
6 | PrivateUsers = yes | 6 | PrivateUsers = yes |
7 | DynamicUser = yes | 7 | DynamicUser = yes |
8 | |||
9 | User = fossil-test-user-%i | 8 | User = fossil-test-user-%i |
10 | RuntimeDirectory = fossil-test-%i | 9 | RuntimeDirectory = fossil-test-%i |
11 | |||
12 | # BindPaths = /run/fossil-test-%i:/.ssh | ||
13 | # Environment = FOSSIL_HOME=/.ssh | ||
14 | |||
15 | BindPaths = /run/fossil-test-%i:/root/.ssh | 10 | BindPaths = /run/fossil-test-%i:/root/.ssh |
16 | Environment = HOME=/root FOSSIL_HOME=/root/.ssh | 11 | Environment = HOME=/root FOSSIL_HOME=/root/.ssh |
17 | 12 | ||
18 | ExecStart = sh -c '[ "$HOME" != /root ] || set -- fakeroot "$@"; "$@"' - sh -exc '\ | 13 | ExecStart = fakeroot sh -exc '\ |
19 | cd; \ | 14 | cd; \ |
20 | ! touch /test.file 2>/dev/null; \ | 15 | ! touch /test.file 2>/dev/null; \ |
21 | mountpoint -q .ssh || ln -s . .ssh; \ | 16 | mountpoint -q .ssh || ln -s . .ssh; \ |