diff --git a/install.sh b/install.sh index 8505fef..39308c7 100755 --- a/install.sh +++ b/install.sh @@ -28,15 +28,15 @@ copy_files() { #cp wmde-rp-unison-initial-sync-nfs.sh $PREFIX/ cp wmde-rp-generate-known-hosts.sh $PREFIX/ #cp wmde-rp-usersync-nfs.sh $PREFIX/ - cp wmde-rp-usersync-ssh.sh $PREFIX/ + cp wmde-rp-unison-sync-ssh.sh $PREFIX/ cp wmde-rp-progress.sh $PREFIX/ cp wmde-rp-common.sh $PREFIX/ chmod 755 $PREFIX/* - cp wmde-rp-usersync.service /etc/systemd/user/wmde-rp-usersync.service + cp wmde-rp-sync.service /etc/systemd/user/wmde-rp-sync.service mkdir -p /etc/systemd/user/default.target.wants - rm -rf /etc/systemd/user/default.target.wants/wmde-rp-usersync.service - ln -s /etc/systemd/user/wmde-rp-usersync.service /etc/systemd/user/default.target.wants/wmde-rp-usersync.service + rm -rf /etc/systemd/user/default.target.wants/wmde-rp-sync.service + ln -s /etc/systemd/user/wmde-rp-sync.service /etc/systemd/user/default.target.wants/wmde-rp-sync.service cp wmde-rp-full.prf /etc cp wmde-rp-config.prf /etc diff --git a/wmde-rp-usersync.service b/wmde-rp-sync.service similarity index 63% rename from wmde-rp-usersync.service rename to wmde-rp-sync.service index 5ea5f17..50efa16 100644 --- a/wmde-rp-usersync.service +++ b/wmde-rp-sync.service @@ -3,7 +3,7 @@ Description=WMDE RP User Sync After=default.target [Service] -ExecStart=/bin/bash -c 'exec /usr/local/bin/wmde/wmde-rp-usersync-ssh.sh' +ExecStart=/bin/bash -c '. /etc/wmde-rp.conf; exec $PREFIX/wmde-rp-$SYNCPRG-sync-ssh.sh' Restart=always RestartSec=20 TimeoutStopSec=5 diff --git a/wmde-rp-usersync-ssh.sh b/wmde-rp-unison-sync-ssh.sh similarity index 100% rename from wmde-rp-usersync-ssh.sh rename to wmde-rp-unison-sync-ssh.sh diff --git a/wmde-rp.conf b/wmde-rp.conf index 37c63dc..3ae7879 100644 --- a/wmde-rp.conf +++ b/wmde-rp.conf @@ -3,7 +3,7 @@ NFSSERVER=nfsserver.gs.wikimedia.de NFSHOMES=/mnt/home PREFIX=/usr/local/bin/wmde -SYNPRG=unison +SYNCPRG=unison ADMIN_USERS="admin root" # never run roaming profiles for this users