From 7796f7e7adabef848cb6aa6bf7fe35d0454331f1 Mon Sep 17 00:00:00 2001 From: mxmehl Date: Tue, 5 Nov 2019 17:36:44 +0100 Subject: [PATCH] restructure passwords --- msmtp/.msmtprc | 2 +- offlineimap/.offlineimap/getpass.py | 2 +- offlineimap/.offlineimap/getpass.pyc | Bin 410 -> 405 bytes offlineimap/.offlineimaprc | 2 +- pass/.password-store/.gpg-id | 1 - pass/.password-store/BorgBackup.gpg | Bin 619 -> 0 bytes pass/.password-store/FSFE | 1 - pass/.password-store/Mail/PfadisWeb.gpg | Bin 597 -> 0 bytes pass/Mail/.gpg-id | 1 + .../DAV => Mail}/Baikal-mxmehl.gpg | Bin .../Mail/FSFE.gpg => Mail/IMAP-FSFE.gpg} | Bin .../Mail/FSFE-SMTP.gpg => Mail/SMTP-FSFE.gpg} | Bin vdirsyncer/config | 2 +- 13 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 pass/.password-store/.gpg-id delete mode 100644 pass/.password-store/BorgBackup.gpg delete mode 120000 pass/.password-store/FSFE delete mode 100644 pass/.password-store/Mail/PfadisWeb.gpg create mode 100644 pass/Mail/.gpg-id rename pass/{.password-store/DAV => Mail}/Baikal-mxmehl.gpg (100%) rename pass/{.password-store/Mail/FSFE.gpg => Mail/IMAP-FSFE.gpg} (100%) rename pass/{.password-store/Mail/FSFE-SMTP.gpg => Mail/SMTP-FSFE.gpg} (100%) diff --git a/msmtp/.msmtprc b/msmtp/.msmtprc index 1943741..615debe 100644 --- a/msmtp/.msmtprc +++ b/msmtp/.msmtprc @@ -13,6 +13,6 @@ host mail.fsfe.org port 587 from max.mehl@fsfe.org user max.mehl -passwordeval pass Mail/FSFE-SMTP +passwordeval pass Mail/SMTP-FSFE account default : fsfe diff --git a/offlineimap/.offlineimap/getpass.py b/offlineimap/.offlineimap/getpass.py index c290d0a..a21f422 100755 --- a/offlineimap/.offlineimap/getpass.py +++ b/offlineimap/.offlineimap/getpass.py @@ -2,4 +2,4 @@ from subprocess import check_output def get_pass(account): - return check_output("pass Mail/" + account, shell=True).splitlines()[0] + return check_output("pass " + account, shell=True).splitlines()[0] diff --git a/offlineimap/.offlineimap/getpass.pyc b/offlineimap/.offlineimap/getpass.pyc index 8e07fd17f4367113b1f6507632eaac6201b4a2fb..af861377deea4412bb47513b7af25893bf119872 100644 GIT binary patch delta 29 lcmbQmJe8S)`79Sm&jN9dCVgX=$*)+pxdux5tlbid)LXC z2iv-`D|OX=ZCR6&w!|dDQans}QIVNgAI*0p#mnlVgA^Q5AC1-hNR7BS`}Ggie5Wjc zRE9IfGZP`$t~uud$c&>F#2bHi#D08e!^HYD764oxoLzSUusb%J?WH42%*M{TNx~Rr zEU8~%oL3m{bi@n)-{WZDtI>}K3hpM=7@B-^n!rUEPPKJa-67iVXm&)@3hdjk7#JZ( zMke7d4`LMv4wHf{sfSVrC2s8-)C_9Ia1?Bb(?j8Tgl?2Ia0diz*v8I-sBL7dM`k~jRQxV?V>Gzl{u=ifG%}nGo9OT*yq}U#VvDs*b06Sm7o2c z?LRn^Hxp&i@_~kX3(6LMdVt8cI?B(K&Qeesb%n~T$mcBIWJaQeEk1D?>~!vFTv3v~ z77&Uub!Pe6HLGaYYDdhH5*~o)ULm;A$41ycz>!@Zi1c#d-xDjz{__-lHo#>ae+ za0WJuW%~rY@J|Z6&RjaaC0bjGh{R5o`E57OQ#~J8nQ@0Sz={AuxfoOHV7AOhU6u$b F9>v3SFEs!F diff --git a/pass/.password-store/FSFE b/pass/.password-store/FSFE deleted file mode 120000 index 6a24321..0000000 --- a/pass/.password-store/FSFE +++ /dev/null @@ -1 +0,0 @@ -/home/max/Repositories/fsfe/passwords/ \ No newline at end of file diff --git a/pass/.password-store/Mail/PfadisWeb.gpg b/pass/.password-store/Mail/PfadisWeb.gpg deleted file mode 100644 index 6642b3d1f10ac474961c56582c0bd7502b6fb61c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 597 zcmV-b0;>Im0t^FM3ge`f{)|fj5CE6FVbq{^UA-Ch>yPdRC(=yeA+!JXjYb<0b}`S(rdEgHZ;>V5 z#(GG1LHi$X6U^JOK=z_3llkyYlFsgQ$bC(b2THS9YS9)bQBF)Nb~-rxpOICQY7)h1yF z-xreo1Hkx{TV67eQU^G4H1%gZ7146q;x;vJCE8M1C2C|JDBOkn`b%nE899nFj=@A7 z^QOzfCpG&bZWxOVdP3M2;nUh4QAPtbX=>d!X!E0Wi$LCE1*YBPNlO5*%@)GmXY6Ia z{OgDwUCh!#sA_*IYi(y5h?|)5RU7yp`k;}?aPNG_x2_h9CuWv|6BUEVgWXHK??wE- zfXz@_{v5%`!^hMaUiVOu$Klvha)2?`&P!E6sId2!lTwdeaQlpJ^@WCp(7RWDl*V~y z8Zfd#(>%ffI|)>%s@w*kjuKy55zf|~7w}FEY_qSsU-jkaj6!AssMLEg$w9uZj$cnZ z8SqeSTuSkS?GB|0ra#g|0mF(Qg?gVQDs#F8tgq7Bg=S&AHRoXoQ-q!~&WTX`BVw*e j;(zVwI%s=|ya+=_W79g%hnJd0Fwtt1hZTvplWlE77NRK3 diff --git a/pass/Mail/.gpg-id b/pass/Mail/.gpg-id new file mode 100644 index 0000000..735698f --- /dev/null +++ b/pass/Mail/.gpg-id @@ -0,0 +1 @@ +E1DD1B5507036B458144104CDA0040918C702037 diff --git a/pass/.password-store/DAV/Baikal-mxmehl.gpg b/pass/Mail/Baikal-mxmehl.gpg similarity index 100% rename from pass/.password-store/DAV/Baikal-mxmehl.gpg rename to pass/Mail/Baikal-mxmehl.gpg diff --git a/pass/.password-store/Mail/FSFE.gpg b/pass/Mail/IMAP-FSFE.gpg similarity index 100% rename from pass/.password-store/Mail/FSFE.gpg rename to pass/Mail/IMAP-FSFE.gpg diff --git a/pass/.password-store/Mail/FSFE-SMTP.gpg b/pass/Mail/SMTP-FSFE.gpg similarity index 100% rename from pass/.password-store/Mail/FSFE-SMTP.gpg rename to pass/Mail/SMTP-FSFE.gpg diff --git a/vdirsyncer/config b/vdirsyncer/config index f874472..3657c5e 100644 --- a/vdirsyncer/config +++ b/vdirsyncer/config @@ -47,4 +47,4 @@ url = "https://d.mehl.mx/baikal/html/dav.php/addressbooks" username = "mxmehl" # The password can also be fetched from the system password storage, netrc or a # custom command. See http://vdirsyncer.pimutils.org/en/stable/keyring.html -password.fetch = ["command", "pass", "DAV/Baikal-mxmehl"] +password.fetch = ["command", "pass", "Mail/Baikal-mxmehl"]