From fe6ebce3a97367746300c06ea09e91d1a55a3b1b Mon Sep 17 00:00:00 2001 From: "theo@manjaro" Date: Thu, 24 Aug 2023 17:36:17 +0200 Subject: [PATCH] Load gpg key from file --- en/contact.gmi | 50 +------------------------------------------------- public.gpg | 41 +++++++++++++++++++++++++++++++++++++++++ publish.py | 9 +++++++++ 3 files changed, 51 insertions(+), 49 deletions(-) create mode 100644 public.gpg diff --git a/en/contact.gmi b/en/contact.gmi index c639a2c..f1cd3cb 100644 --- a/en/contact.gmi +++ b/en/contact.gmi @@ -1,7 +1,6 @@ # How to contact me ## General - => mailto:theow@tutanota.de Mail => https://soc.webair.xyz/@theo Mastodon/Fediverse => https://matrix.to/#/@theo:mtrx.webair.xyz Matrix @@ -19,53 +18,6 @@ ## GPG -Public key: ``` - -----BEGIN PGP PUBLIC KEY BLOCK----- - -mQGNBGTIzAgBDADnad2/EWj+ExyXycY2oXybIAc543kdQAl8fmdVMYUvXNh1WGPa -smYqJQHPjO81YtzUeQnZ1adVs0gJSwXYtsbzi+SOaKAh0FvVEFB/Gb0dA7DGTLJH -LICv+6cPx6SZpvWvgop8c2yEt33yw9zvCIK1tHuC719mwBhAuJ9/lfi35rPLICFi -PabGC5p1E6T4amkAmTxfTVdPAwGz2k8jVFBq2sexxsHaIgws11yIHwuDftTu0b1T -9e9ibYdum0Gy8Q7MbdaFHAN2iwTlwKhqf46xqnRff9HORJZx196zu9h/n0GEzNxe -N2c1k0qpEEhWqB5iwR02VSZ3OB8Oyj2fXrzqQxITdABuBcArTICeQ26yyYXfZPjy -PzbqxSyVj2y3IPK6vgcpwB3TAiVrx6/diQfhud2pzeFJ1dfu1lIOoJ5Efb8FPAFG -9oiKB721yBNRiHLp+ZGdwTyf+YBl0FEYQ3UeJyT2EkSHzzVfWVPz2gcY59SepGNF -ORAGm+XhpkkdkvUAEQEAAbQZdGhlb3cgPHRoZW93QHR1dGFub3RhLmRlPokB1AQT -AQgAPhYhBHdmgBSyfVSNUSOTUcrrk3922cZ0BQJkyMwIAhsDBQkDwmcABQsJCAcC -BhUKCQgLAgQWAgMBAh4BAheAAAoJEMrrk3922cZ0gW0L/jJFhA32+9W8nk2W5l7e -FQ1lh/JEX8Q3/8Y1cIJEJ1SGrfVNGBc8Ka65oiJUutc92704oqGeiYFYk/sAKXhR -VeZ7+KxXI1gTvnkmhrFL0UVxLLUo3UQoOmtb1oxnt3X9XTA0AtUmVkgzAHbDI+wB -/1CFFy0yC/jr9ZgrWZ3J53s/qxkK7ojMfGkRQusuEy8sGhthJReEJ9vj62qrROMK -mZcVChvZ6Ba3J8tOs3XA0HAUZp/CFGj9+eYAVUz4mJhadtrBtZEsWgbcm1a0QmfZ -2V9x4TIshEPg0b0VkZWc7sYnHst3KraFz1r5w4oDbLvrLmDUb01VabBPqhyqG94F -K+wtpql+vLdlBLAtwYrtUyDlFqAWaU8NzH8uIETaJ+R3OkL+UCVTWylNd51RWG/s -vhiowqdkaeEQAnJZmuF+QFEkG4ddBxIglLAXQkb8E/aykDrWMTs99U3Rxl70/WBt -CJzT+QjspA29wpPJGOoXfPIc/ID3D0+HUXv/lYIKjf2RtrkBjQRkyMwIAQwAtLob -DMQsxjmuNOxBrEe3GaxVKAP7eFS/RiBMt+tbBj7L8Z0/mG9fk0OQYtivzhpZHakH -UshwNyvj7Poxa3CGP3aeHOGrVcancM0TPQJKBMUyXqbV/Gk4afv1dAMBj9fjgyc8 -MTzdRyajkZAlUs+dqi1hcFmG1S0TapAiRx23ifHhdrcRVu7mKfXyWT/nLLfyfPTi -3zeEHbS6Wg+HILas3eMX4hTFtFv0nvyp4PLNVJQ4pFNqu3+5YLsddAGbX25lrpe6 -gpHwLCOqzOTMhaHg8hXmkqSkmAEGth53jo8wW464iiNU6zIR9HklChEtTiMfIqyC -RQO+lLeOA4nOx9WN86G7xgs1jeWJrCyhABIZIDOM2YDpHQXL4hYRQKBma442xeCO -otWtrZoecwdhhhAuqAiGK8pA9SLrQNdHxPccx6WSk62RemYD7QeRmhG4hN14uITF -wCvetcbsU23KeGHoH6o8mmX5Kyh/yfFtWTvsCyV8pmZCJShF0QfdIK3ZoEePABEB -AAGJAbwEGAEIACYWIQR3ZoAUsn1UjVEjk1HK65N/dtnGdAUCZMjMCAIbDAUJA8Jn -AAAKCRDK65N/dtnGdFiuDAC0rqGJx5T6KolS6vChdkeaj2s41xarOcDP0nfNalY3 -uIVjACUyDZEkVQs7JyPehhxWDrSyXf9pyzH6TmwrQ/IPPx/NLpBX3jarQVN79rI8 -A5UFgDpfLQpneUjZFN4YhojT4ZaR5t8D6XQEnWL3Qfa6lZIXxdmfVS9wsHX0Kv3y -yCyFliuU7QYNUECeYW1Jg15pWGSSet8F1KiIuZTaYKwXe1V5ogRbYz66KjWwedaG -1nXxeFvqhx1RMljSb5tu82aBKcgaxuAjZEKwDcM+UNnq4lO3+K1nN46PU6CnjyMT -+sZ+edk9pswyAXczJR4/ViNpp9mrVWKmv0qgSfs6aOhCXQr8RpHeA4SWc0BHIf64 -MAH9r94FWM8igka/nWxOu8qlJLgTHXph+jUPgIjLwHpu7/FlE1ClYPKb0p1nuV6T -2g2wE5pA0EW2wPcwlU9RuHAazHacm3RIpM1HyewJ3J/NIhp4cA7SxColjOc3fgF5 -o/SIa3jegj+ZqyoFNOq9VTA= -=H3IG ------END PGP PUBLIC KEY BLOCK----- -``` - -Fingerprint: -``` -pub rsa3072/CAEB937F76D9C674 2023-08-01 theow - Primary key fingerprint: 7766 8014 B27D 548D 5123 9351 CAEB 937F 76D9 C674 +$GPGPUBKEY ``` diff --git a/public.gpg b/public.gpg new file mode 100644 index 0000000..f04e3d7 --- /dev/null +++ b/public.gpg @@ -0,0 +1,41 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +o/SIa3jegj+ZqyoFNOq9VTA= +=H3IG +-----END PGP PUBLIC KEY BLOCK----- diff --git a/publish.py b/publish.py index 470fd17..cd8613f 100755 --- a/publish.py +++ b/publish.py @@ -15,6 +15,14 @@ global_subtitle = "Theo's web corner" global_name = "Theo" base_url = "webair.xyz/" +global_pubkey = "" +try: + with open("public.gpg", "r") as f: + global_pubkey = f.read() +except FileNotFoundError: + print("GPG public key not found!") + global_pubkey = "" + geminidir = "./public_gemini" htmldir = "./public_html" local_url = "/home/ploum/dev/gemlog/" @@ -48,6 +56,7 @@ def fill_globals(text): .replace("$BASE_URL", base_url)\ .replace("$GLOBAL_TITLE", global_title)\ .replace("$SUBTITLE", global_subtitle)\ + .replace("$GPGPUBKEY", global_pubkey) # Add the html version to the post dictionnary