7 Commits

Author SHA1 Message Date
  Robin Thoni db08443a73 Save and load env for cron tasks; fixed monthly/weekly order 5 years ago
  Robin Thoni 25181b68ff Added default hostname and domainname in docker-compose.yml 5 years ago
  Robin Thoni 80f706f274 Added default TZ variable in env 5 years ago
  Robin Thoni eacf0ec922 Set FromLineOverride to No 5 years ago
  Robin Thoni 957591478f Updated rclone 5 years ago
  Robin Thoni 06b3531265 Updated to debian stretch 5 years ago
  Robin Thoni 417f7046b6 Removed unnecessary space and newline 5 years ago

+ 2
- 0
docker-compose.yml View File

5
         build: ./rsnapshot
5
         build: ./rsnapshot
6
         container_name: rsnapshot-rsnapshot
6
         container_name: rsnapshot-rsnapshot
7
 #        restart: unless-stopped
7
 #        restart: unless-stopped
8
+#        hostname: rsnapshot
9
+#        domainname: example.com
8
         networks:
10
         networks:
9
             rsnapshot.internal.docker:
11
             rsnapshot.internal.docker:
10
                 aliases:
12
                 aliases:

+ 2
- 0
env View File

1
+TZ=Europe/London
2
+
1
 SSMTP_ROOT=root@example.com
3
 SSMTP_ROOT=root@example.com
2
 SSMTP_MAILHUB=172.17.0.1:10025
4
 SSMTP_MAILHUB=172.17.0.1:10025
3
 SSMTP_MAILDOMAIN=example.com
5
 SSMTP_MAILDOMAIN=example.com

+ 2
- 2
rsnapshot/Dockerfile View File

1
-FROM robinthoni/debian-multiarch:jessie
1
+FROM debian:stretch
2
 
2
 
3
 ARG CONFIG_DIR=/etc/default/config-files/
3
 ARG CONFIG_DIR=/etc/default/config-files/
4
 
4
 
7
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
7
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
8
     rm /etc/cron.*/*
8
     rm /etc/cron.*/*
9
 
9
 
10
-RUN wget -O /tmp/rclone.deb 'https://downloads.rclone.org/v1.41/rclone-v1.41-linux-amd64.deb' && \
10
+RUN wget -O /tmp/rclone.deb 'https://downloads.rclone.org/v1.47.0/rclone-v1.47.0-linux-amd64.deb' && \
11
     dpkg -i /tmp/rclone.deb && rm /tmp/rclone.deb
11
     dpkg -i /tmp/rclone.deb && rm /tmp/rclone.deb
12
 
12
 
13
 COPY ./vars-vars /etc/vars-vars
13
 COPY ./vars-vars /etc/vars-vars

+ 2
- 3
rsnapshot/config/rsnapshot.conf View File

252
 # RSYNC.SAMBA.ORG
252
 # RSYNC.SAMBA.ORG
253
 #backup	rsync://rsync.samba.org/rsyncftp/	rsync.samba.org/rsyncftp/
253
 #backup	rsync://rsync.samba.org/rsyncftp/	rsync.samba.org/rsyncftp/
254
 
254
 
255
-backup_script	/bin/date "+ backup started at %c" | /usr/bin/tee date	backup_start_date
255
+backup_script	/bin/date "+backup started at %c" | /usr/bin/tee date	backup_start_date
256
 
256
 
257
 include_conf	/etc/rsnapshot/user_backup.conf
257
 include_conf	/etc/rsnapshot/user_backup.conf
258
 
258
 
259
-backup_script	/bin/date "+ backup ended at %c" | /usr/bin/tee date	backup_end_date
260
-
259
+backup_script	/bin/date "+backup ended at %c" | /usr/bin/tee date	backup_end_date

+ 4
- 4
rsnapshot/config/rsnapshot.cron.conf View File

5
 # To activate this cron file you have to uncomment the lines below.
5
 # To activate this cron file you have to uncomment the lines below.
6
 # Feel free to adapt it to your needs.
6
 # Feel free to adapt it to your needs.
7
 
7
 
8
-# 00 */4		* * *		root	/usr/bin/rsnapshot hourly
9
- 00  3  	* * *		root	/usr/bin/rsnapshot daily
10
- 50  2  	* * 1		root	/usr/bin/rsnapshot weekly
11
- 55  2  	1 * *		root	/usr/bin/rsnapshot monthly
8
+# 00 */4		* * *		root	. /tmp/env; /usr/bin/rsnapshot hourly
9
+ 00  3  	* * *		root	. /tmp/env; /usr/bin/rsnapshot daily
10
+ 55  2  	* * 1		root	. /tmp/env; /usr/bin/rsnapshot weekly
11
+ 50  2  	1 * *		root	. /tmp/env; /usr/bin/rsnapshot monthly

+ 1
- 1
rsnapshot/config/ssmtp.conf View File

16
 #hostname=
16
 #hostname=
17
 
17
 
18
 # Are users allowed to set their own From: address? (YES/NO)
18
 # Are users allowed to set their own From: address? (YES/NO)
19
-FromLineOverride=YES
19
+FromLineOverride=NO

+ 3
- 1
rsnapshot/run.sh View File

4
 
4
 
5
 replace_files
5
 replace_files
6
 
6
 
7
-cron -f
7
+env | grep -Ev 'BASHOPTS|BASH_VERSINFO|EUID|PPID|SHELLOPTS|UID' | sed 's/^\(.*\)$/export \1/' > /tmp/env
8
+
9
+cron -fn

Loading…
Cancel
Save