From 55237266419aad0896d20b33f7588f5729b95784 Mon Sep 17 00:00:00 2001 From: msnie Date: Fri, 9 Feb 2024 22:58:17 +0100 Subject: [PATCH] README --- README.md | 16 ++++------------ scripts/sync_tv.sh | 22 ++++++++++++++++------ 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index c61bd0c..7d7aa3b 100644 --- a/README.md +++ b/README.md @@ -193,7 +193,7 @@ UUID=6fb3bc60-e984-43ce-a688-151b49f558e0 /home/null/shares/disk2 auto defaults, After adding the domain name to the docker-compose.yml and the gitlab configuration: -``` yaml +```yaml hostname: 'gitlab.knast.cc' environment: GITLAB_OMNIBUS_CONFIG: | @@ -216,14 +216,14 @@ edit the nextcloud config.php to use the https protocol nano /srv/nextcloud/config/config.php ``` -```sh + We also use traefik and docker. I have added the following traefik label in our docker-compose.yml: ```yml - "traefik.http.middlewares.nc-header.headers.customRequestHeaders.X-Forwarded-Proto=https" ``` - +```sh And in the config.php, I’ve also added some values regarding reverse proxies: 'forwarded_for_headers' => @@ -268,15 +268,9 @@ volumes: NOTE: Just switch to syncthing ```sh -#SYNC MOVIES FROM UNITY TO DISK 2 -# CRON JOB - * * * * * /usr/bin/flock -n /tmp/classics.lockfile /home/$USER/home_server/scripts/sync_classics.sh * * * * * /usr/bin/flock -n /tmp/flims.lockfile /home/$USER/home_server/scripts/sync_flims.sh * * * * * /usr/bin/flock -n /tmp/tv.lockfile /home/$USER/home_server/scripts/sync_tv.sh - -# movie_sync.sh CONTENT - ``` @@ -307,11 +301,9 @@ echo "CRON TV FILE SYNC RAN AT: " `date '+%Y-%m-%d %H:%M:%S'` >> /home/null/logs */25 * * * * /usr/bin/chmod -v 0777 -R /home/knast/shares/disk1/tv/* > /home/knast/logs/tv_chmod.log +``` ```sh - -# tv_sync.sh CONTENT - #!/bin/bash echo "STARTING TV FILE SYNC RAN AT: " `date '+%Y-%m-%d %H:%M:%S'` >> /home/null/logs/tv_cron.log /usr/bin/rsync -ravz --bwlimit=5000 --stats --progress --exclude='/home/null/shares/disk2/media/tv' -e "ssh -i /home/null/.ssh/id_rsa_sync " 'invalid@unity.whatbox.ca:/home/invalid/files/_tv' '/home/null/shares/disk2/media/tv' >> /home/null/logs/tv_cron.log diff --git a/scripts/sync_tv.sh b/scripts/sync_tv.sh index 3bd54d1..7c95a6a 100755 --- a/scripts/sync_tv.sh +++ b/scripts/sync_tv.sh @@ -1,8 +1,18 @@ #!/bin/bash -log_file=tv_cron.log -echo "STARTING TV FILE SYNC RAN AT: " `date '+%Y-%m-%d %H:%M:%S'` > /home/$USER/logs/$log_file ; -/usr/bin/rsync -avz --no-perms --no-owner --no-group --stats --progress --exclude=/home/$USER/shares/disk1/tv -e "ssh -i /home/$USER/.ssh/id_rsa_what " invalid@mir.whatbox.ca:/home/invalid/files/_tv/ /home/$USER/shares/disk1/tv >> /home/$USER/logs/$log_file -echo "CRON TV FILE SYNC RAN AT: " `date '+%Y-%m-%d %H:%M:%S'` >> /home/$USER/logs/$log_file -/usr/bin/chmod 777 -R /home/$USER/shares/disk1/tv > /home/$USER/logs/chmod_tv.log -echo "CRON CHMOD TV RAN AT: " `date '+%Y-%m-%d %H:%M:%S'` >> /home/$USER/logs/chmod_tv.log \ No newline at end of file +# THIS SCRIPT REQUIRES A KEY AND SSH CONFIG OF THE REMOTE HOST + +SYNC_TYPE=TV + +LOG_FILE=tv_cron.log +LOG_CHMOD=chmod_tv.log +LOG_DIR=/home/$USER/logs + +TARGET_ON_HOST=/home/$USER/shares/disk1/tv +TARGET_ON_REMOTE=/home/invalid/files/_tv/ + +echo "STARTING $SYNC_TYPE FILE SYNC RAN AT: " `date '+%Y-%m-%d %H:%M:%S'` > $LOG_DIR/$LOG_FILE ; +/usr/bin/rsync -avz --no-perms --no-owner --no-group --stats --progress --exclude=$TARGET_ON_HOST -e "ssh -i /home/$USER/.ssh/id_rsa_what " whatbox:$TARGET_ON_REMOTE $TARGET_ON_HOST >> $LOG_DIR/$LOG_FILE +echo "CRON $SYNC_TYPE FILE SYNC RAN AT: " `date '+%Y-%m-%d %H:%M:%S'` >> $LOG_DIR/$LOG_FILE +/usr/bin/chmod 777 -R $TARGET_ON_HOST > $LOG_DIR/$LOG_CHMOD +echo "CRON CHMOD $SYNC_TYPE RAN AT: " `date '+%Y-%m-%d %H:%M:%S'` >> $LOG_DIR/$LOG_CHMOD \ No newline at end of file