add muhq.space to offlineimap setup.

Other changes:
	* fix syntax bug in setup.py
	* change file permission for decryptet files to 600.

3 files changed, 31 insertions, 15 deletions

diff --git a/offlineimap/MUHQ.IMAP.PASS.gpg b/offlineimap/MUHQ.IMAP.PASS.gpg
new file mode 100644
index 0000000..5779c07
--- /dev/null
+++ b/offlineimap/MUHQ.IMAP.PASS.gpg
diff --git a/offlineimap/offlineimaprc b/offlineimap/offlineimaprc
index d9f6aca..7c7b941 100644
--- a/offlineimap/offlineimaprc
+++ b/offlineimap/offlineimaprc
@@ -1,26 +1,41 @@
-# Sample minimal config file.  Copy this to ~/.offlineimaprc and edit to
-# get started fast.
+# offlineimap config file
 
 [general]
-accounts = FAUMail
-
-[Account FAUMail]
-localrepository = Local
-remoterepository = Remote
+accounts = FAUMail,MUHQ
 
 autorefresh=5
 quick=10
 
-[Repository Local]
-type = Maildir
-localfolders = ~/Mail
+[Account FAUMail]
+localrepository = LocalFAU
+remoterepository = FAU
 
-[Repository Remote]
+[Account MUHQ]
+localrepository=LocalMUHQ
+remoterepository=MUHQ
+
+[Repository FAU]
 type = IMAP
 remotehost = faumail.uni-erlangen.de
 remoteport = 993
 remoteuser = aj46ezos
 remotepassfile = $DOTFILES_LOCATION/decrypted/FAU.IMAP.PASS
-
 ssl=yes
 cert_fingerprint = BB9EE687E92693794C752F57C53483076DEF2755
+
+[Repository LocalFAU]
+type = Maildir
+localfolders = ~/Mail/FAU/
+
+[Repository MUHQ]
+type = IMAP
+remotehost = antares.uberspace.de
+remoteport = 993
+remoteuser = muhq
+remotepassfile = $DOTFILES_LOCATION/decrypted/MUHQ.IMAP.PASS
+ssl=yes
+cert_fingerprint = B53A1586456E35E454DA3581980330903753AD3E
+
+[Repository LocalMUHQ]
+type = Maildir
+localfolders = ~/Mail/MUHQ/
diff --git a/setup.py b/setup.py
index 1f5fe83..60696df 100755
--- a/setup.py
+++ b/setup.py
@@ -54,7 +54,7 @@ def dotfile_loc_helper(quiet):
 
 def offlineimap_passwd(quiet):
     """Write the environment file for the systemd unit"""
-    res = dotfile_loc_helper(quiet):
+    res = dotfile_loc_helper(quiet)
     if res:
         return res
     env_file_path = "/etc/systemd/system/offlineimap@fischerling.env"
@@ -116,7 +116,8 @@ targets = {
         "offlineimap":
             [offlineimap_warn,
             ("offlineimap/offlineimaprc", home_dir + "/.offlineimaprc"),
-            ("offlineimap/FAU.IMAP.PASS.gpg", home_dir +"/.fau_imap_pass"),
+            ("offlineimap/FAU.IMAP.PASS.gpg", ""),
+            ("offlineimap/MUHQ.IMAP.PASS.gpg", ""),
             ("offlineimap/offlineimap@.service",
                 "/etc/systemd/system/offlineimap@" + user + ".service"),
             offlineimap_passwd],
@@ -156,7 +157,7 @@ def install_target(target, quiet):
                                 instruction[1])
 
                         # set privacy friendly file permissions 
-                        if not subprocess.run(["chmod", "660", instruction[0]]):
+                        if not subprocess.run(["chmod", "600", instruction[0]]):
                             print("Skipping because changing permissions of",
                                     instruction[1], "failed. This could be a",
                                     "privacy risk!", file=sys.stderr)