diff --git a/README.md b/README.md index 1269a1b..5b5a2b8 100644 --- a/README.md +++ b/README.md @@ -14,14 +14,12 @@ given a service: * log into firewall, block http for the given service * set permissions and ownership on new keys * perform service specific hooks - * jellyfin: generating a pkcs12 key + * jellyfin/plex: generate a pkcs12 key and + put it in the right place All secrets are GPG encrypted and one password prompt allows for script access to all secrets necessary. State: - * Only jellyfin is tested and working - * Can only really test when keys come closer to expiring - * code is ugly, could be a nice class or something - + * running for all services, no known bugs at this time diff --git a/update_cert.py b/update_cert.py index 60d2824..b929438 100755 --- a/update_cert.py +++ b/update_cert.py @@ -61,10 +61,10 @@ def firewall_mod(state, service, decrypt_pp): log.info(f'env for fw: ssl_service: {service}') log.info(f'cmd to connect to firewall: "{" ".join(cmd)}"') p = pexpect.spawnu(' '.join(cmd)) - res = p.expect([f"Enter passphrase for key '{router_key}':", + res = p.expect([f'Enter passphrase for key "{router_key}":', pexpect.TIMEOUT, pexpect.EOF]) if res > 0: - sys.exit('Couldnt send decryption key to ssh.') + sys.exit('Couldnt send decryption key to ssh.') p.sendline(decrypt_pp) res = p.expect(['success', pexpect.TIMEOUT, pexpect.EOF]) if res > 0: