aboutsummaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorSimon Frei <freisim93@gmail.com>2021-02-11 12:18:47 +0100
committerGitHub <noreply@github.com>2021-02-11 12:18:47 +0100
commitf2e9b40ad169ce01551dbd2c7a2ba57810659bcb (patch)
tree369152d6e0df0d2a67d4738e237b35a239ff7f42 /etc
parent6697b8fde39c673e8d2ec3ed0a0fbcc93abcd471 (diff)
downloadsyncthing-f2e9b40ad169ce01551dbd2c7a2ba57810659bcb.tar.gz
syncthing-f2e9b40ad169ce01551dbd2c7a2ba57810659bcb.zip
etc: Adjust all the startup scripts to new cmd (ref #7330) (#7353)
Diffstat (limited to 'etc')
-rw-r--r--etc/freebsd-rc/syncthing5
-rw-r--r--etc/linux-desktop/syncthing-start.desktop2
-rwxr-xr-xetc/linux-runit/run3
-rw-r--r--etc/linux-systemd/system/syncthing@.service2
-rw-r--r--etc/linux-systemd/user/syncthing.service2
5 files changed, 7 insertions, 7 deletions
diff --git a/etc/freebsd-rc/syncthing b/etc/freebsd-rc/syncthing
index 64c5d2cc6..174999094 100644
--- a/etc/freebsd-rc/syncthing
+++ b/etc/freebsd-rc/syncthing
@@ -38,13 +38,14 @@ syncthing_group=${syncthing_group:-$syncthing_user}
command=/usr/local/bin/syncthing
pidfile=/var/run/syncthing.pid
-syncthing_flags="${syncthing_home:+-home=${syncthing_home}} ${syncthing_log_file:+-logfile=${syncthing_log_file}}"
+syncthing_cmd=serve
+syncthing_flags="${syncthing_home:+--home=${syncthing_home}} ${syncthing_log_file:+--logfile=${syncthing_log_file}}"
syncthing_start() {
echo "Starting syncthing"
touch ${pidfile} && chown ${syncthing_user} ${pidfile}
touch ${syncthing_log_file} && chown ${syncthing_user} ${syncthing_log_file}
- /usr/sbin/daemon -cf -p ${pidfile} -u ${syncthing_user} ${command} ${syncthing_flags}
+ /usr/sbin/daemon -cf -p ${pidfile} -u ${syncthing_user} ${command} ${syncthing_cmd} ${syncthing_flags}
}
syncthing_cleanup() {
diff --git a/etc/linux-desktop/syncthing-start.desktop b/etc/linux-desktop/syncthing-start.desktop
index 17051a576..93111ffa5 100644
--- a/etc/linux-desktop/syncthing-start.desktop
+++ b/etc/linux-desktop/syncthing-start.desktop
@@ -2,7 +2,7 @@
Name=Start Syncthing
GenericName=File synchronization
Comment=Starts the main syncthing process in the background.
-Exec=/usr/bin/syncthing -no-browser -logfile=default
+Exec=/usr/bin/syncthing serve --no-browser --logfile=default
Icon=syncthing
Terminal=false
Type=Application
diff --git a/etc/linux-runit/run b/etc/linux-runit/run
index 497066b93..3f11867bc 100755
--- a/etc/linux-runit/run
+++ b/etc/linux-runit/run
@@ -5,5 +5,4 @@ export HOME="/home/$USERNAME"
export SYNCTHING="$HOME/bin/syncthing"
exec 2>&1
-exec chpst -u "$USERNAME" "$SYNCTHING" -logflags 0
-
+exec chpst -u "$USERNAME" "$SYNCTHING" serve --logflags 0
diff --git a/etc/linux-systemd/system/syncthing@.service b/etc/linux-systemd/system/syncthing@.service
index 70bdade0b..6d676009c 100644
--- a/etc/linux-systemd/system/syncthing@.service
+++ b/etc/linux-systemd/system/syncthing@.service
@@ -5,7 +5,7 @@ After=network.target
[Service]
User=%i
-ExecStart=/usr/bin/syncthing -no-browser -no-restart -logflags=0
+ExecStart=/usr/bin/syncthing serve --no-browser --no-restart --logflags=0
Restart=on-failure
RestartSec=5
SuccessExitStatus=3 4
diff --git a/etc/linux-systemd/user/syncthing.service b/etc/linux-systemd/user/syncthing.service
index 0e648fa04..7ad05d95a 100644
--- a/etc/linux-systemd/user/syncthing.service
+++ b/etc/linux-systemd/user/syncthing.service
@@ -3,7 +3,7 @@ Description=Syncthing - Open Source Continuous File Synchronization
Documentation=man:syncthing(1)
[Service]
-ExecStart=/usr/bin/syncthing -no-browser -no-restart -logflags=0
+ExecStart=/usr/bin/syncthing serve --no-browser --no-restart --logflags=0
Restart=on-failure
RestartSec=5
SuccessExitStatus=3 4