From 038644cbbfd13aee337a0ad7dc58b268e3558d58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu>
Date: Wed, 17 May 2017 08:55:36 +0200
Subject: [PATCH] Fixed crash because of an invalid setup.
---
9.MediaVault/1.Install_MediaVault/0_setup.py | 38 ++++++++++----------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/9.MediaVault/1.Install_MediaVault/0_setup.py b/9.MediaVault/1.Install_MediaVault/0_setup.py
index aa58d133..47f2b796 100755
--- a/9.MediaVault/1.Install_MediaVault/0_setup.py
+++ b/9.MediaVault/1.Install_MediaVault/0_setup.py
@@ -5,24 +5,26 @@ import utils
import socket
import os
-CROND_TEMPLATE = '''# https://github.com/laurent22/rsync-time-backup
-0 22 * * * /usr/local/sbin/rsync_tmbackup.sh /etc root@{backup_server}:/backup/{hostname}/etc
-0 22 * * * /usr/local/sbin/rsync_tmbackup.sh /home root@{backup_server}:/backup/{hostname}/home
-'''
-cmds = [
- 'cp rsync_tmbackup.sh /usr/local/sbin',
- 'cp /tmp/backup.cron /etc/cron.d/',
-]
+def setup(interactive=True):
+ CROND_TEMPLATE = '''# https://github.com/laurent22/rsync-time-backup
+ 0 22 * * * /usr/local/sbin/rsync_tmbackup.sh /etc root@{backup_server}:/backup/{hostname}/etc
+ 0 22 * * * /usr/local/sbin/rsync_tmbackup.sh /home root@{backup_server}:/backup/{hostname}/home
+ '''
-server = utils.get_conf('BACKUP_SERVER', '')
-if server:
- if os.path.exists('/etc/cron.d/backup.cron'):
- print('/etc/cron.d/backup.cron already here, skipping install')
+ cmds = [
+ 'cp rsync_tmbackup.sh /usr/local/sbin',
+ 'cp /tmp/backup.cron /etc/cron.d/',
+ ]
+
+ server = utils.get_conf('BACKUP_SERVER', '')
+ if server:
+ if os.path.exists('/etc/cron.d/backup.cron'):
+ print('/etc/cron.d/backup.cron already here, skipping install')
+ else:
+ with open('/tmp/backup.cron', 'w') as f:
+ CROND = CROND_TEMPLATE.format(backup_server=server, hostname=socket.gethostname())
+ f.write(CROND)
+ utils.run_commands(cmds)
else:
- with open('/tmp/backup.cron', 'w') as f:
- CROND = CROND_TEMPLATE.format(backup_server=server, hostname=socket.gethostname())
- f.write(CROND)
- utils.run_commands(cmds)
-else:
- print('Missing BACKUP_SERVER in conf')
+ print('Missing BACKUP_SERVER in conf')
--
GitLab