From acf5399b02808bb887fb2f3d51b96eedd1ddbc11 Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@2li.ch>
Date: Sun, 18 Dec 2016 15:18:16 +0100
Subject: [PATCH] rename backup_to_fileserver to backup_to_external

I've renamed the files because it makes more sense this way. Since I
would like to add a function to check if an external disk is present.
---
 .gitignore                                    |  5 ++++
 ..._to_fileserver.sh => backup_to_external.sh |  2 +-
 borg_interface.cfg                            |  8 +++---
 ...to_fileserver.py => backup_to_external.py} | 26 ++++++++++++++-----
 borg_interface/interface_functions.py         |  2 +-
 5 files changed, 31 insertions(+), 12 deletions(-)
 rename backup_to_fileserver.sh => backup_to_external.sh (64%)
 rename borg_interface/{backup_to_fileserver.py => backup_to_external.py} (68%)

diff --git a/.gitignore b/.gitignore
index 5c99f15..5b35ddd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,3 +66,8 @@ Session.vim
 .netrwhist
 *~
 
+# pycharm fils
+.idea/
+.idea
+
+
diff --git a/backup_to_fileserver.sh b/backup_to_external.sh
similarity index 64%
rename from backup_to_fileserver.sh
rename to backup_to_external.sh
index 5ad474d..bb4b9ab 100755
--- a/backup_to_fileserver.sh
+++ b/backup_to_external.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 PATH=$PATH:borg_interface/bin/
 source borg_interface/bin/activate
-python3 borg_interface/backup_to_fileserver.py
+python3 borg_interface/backup_to_external.py
 exit 0
diff --git a/borg_interface.cfg b/borg_interface.cfg
index 098a682..a351f72 100644
--- a/borg_interface.cfg
+++ b/borg_interface.cfg
@@ -1,5 +1,5 @@
 [DEFAULT]
-#server: fileserver.2li.local
-#user: borg
-repository_path: /home/andreas/test
-password: foo
+server: fileserver.2li.local
+user: borg
+repository_path: /home/borg/backup/gwyn
+password: 7EMvQ9G4ay7woHXSS5Dt27eZDsnDZu
diff --git a/borg_interface/backup_to_fileserver.py b/borg_interface/backup_to_external.py
similarity index 68%
rename from borg_interface/backup_to_fileserver.py
rename to borg_interface/backup_to_external.py
index c89446d..7e229a7 100644
--- a/borg_interface/backup_to_fileserver.py
+++ b/borg_interface/backup_to_external.py
@@ -10,17 +10,24 @@ int_vars = interface_variables
 
 
 def take_backup():
-    response = subprocess.Popen(['ping', '-c', '1', 'fileserver.2li.local'])
+    response = subprocess.Popen(['ping', '-c', '1', 'fileserver.2li.local'],
+                               stdout=subprocess.PIPE)
     response.wait()
     returncode = response.returncode
     if returncode == 0:
         backup_home()
+        print()
+        print()
         backup_vms()
+        print()
+        print()
         prune_home()
+        print()
+        print()
         prune_vms()
     else:
         print("Server not available")
-        sys.exit(0)
+        sys.exit(1)
 
 
 def backup_home():
@@ -28,7 +35,9 @@ def backup_home():
     archive_name = (socket.gethostname() + "-home"
                     + time.strftime("_%Y-%m-%d_%H:%M"))
 
-    p = subprocess.Popen(['borg', 'create', '--exclude', '/home/andreas/.cache',
+    print("Backup " + archive_name)
+    p = subprocess.Popen(['borg', 'create', '-v', '--stats', '--exclude',
+                          '/home/andreas/.cache',
                           '--exclude', '/home/andreas/Downloads',
                           '::' + archive_name, path_to_backup])
     p.wait()
@@ -39,14 +48,17 @@ def backup_vms():
     archive_name = (socket.gethostname() + "-VMs"
                     + time.strftime("_%Y-%m-%d_%H:%M"))
 
-    p = subprocess.Popen(['borg', 'create',
+    print("Backup " + archive_name)
+    p = subprocess.Popen(['borg', 'create', '-v', '--stats',
                           '::' + archive_name, path_to_backup])
     p.wait()
 
 
 def prune_home():
     archive_name = (socket.gethostname() + "-home")
-    p = subprocess.Popen(['borg', 'prune', '--prefix', archive_name,
+    print("Prune " + archive_name)
+    p = subprocess.Popen(['borg', 'prune', '-v', '--stats', '--prefix',
+                          archive_name,
                           '--keep-hourly=24', '--keep-daily=7',
                           '--keep-weekly=4', '--keep-monthly=12',
                           '--keep-yearly=1'])
@@ -55,7 +67,9 @@ def prune_home():
 
 def prune_vms():
     archive_name = (socket.gethostname() + "-VMs")
-    p = subprocess.Popen(['borg', 'prune', '--prefix', archive_name,
+    print("Prune " + archive_name)
+    p = subprocess.Popen(['borg', 'prune', '-v', '--stats', '--prefix',
+                          archive_name,
                           '--keep-hourly=24', '--keep-daily=7',
                           '--keep-weekly=4', '--keep-monthly=12',
                           '--keep-yearly=1'])
diff --git a/borg_interface/interface_functions.py b/borg_interface/interface_functions.py
index e856bdb..5781390 100644
--- a/borg_interface/interface_functions.py
+++ b/borg_interface/interface_functions.py
@@ -124,7 +124,7 @@ def configuration():
         config.read(config_file)
     else:
         print("Configuration file not found.")
-        sys.exit(0)
+        sys.exit(1)
     # assign the repository variable depending whether it's a remote or a local
     # repository
     if 'server' in config['DEFAULT']: