| author | |
| committer | |
| log | 6e686c1140e99b56860514fbface0655b333dba3 |
| tree | 7880cd572757b2bad211edd128752a718d6a29bb |
| parent | 8f1d2e181c2e47008364c10edc1a6692e4ca1bca |
| signature |
2 files changed, 13 insertions(+), 1 deletions(-)
config/forgejo/ssh/keys.py+6-1| ... | @@ -40,6 +40,11 @@ def get_key_id(container: str): | ... | @@ -40,6 +40,11 @@ def get_key_id(container: str): |
| 40 | return None | 40 | return None |
| 41 | 41 | ||
| 42 | 42 | ||
| 43 | def same_public_key(stored_key: str): | ||
| 44 | parts = stored_key.split() | ||
| 45 | return len(parts) >= 2 and parts[0] == key_type and parts[1] == key | ||
| 46 | |||
| 47 | |||
| 43 | clover_id = get_key_id("forgejo") | 48 | clover_id = get_key_id("forgejo") |
| 44 | evil_id = get_key_id("evil-forgejo") | 49 | evil_id = get_key_id("evil-forgejo") |
| 45 | knot_did = None | 50 | knot_did = None |
| ... | @@ -67,7 +72,7 @@ try: | ... | @@ -67,7 +72,7 @@ try: |
| 67 | check=False, | 72 | check=False, |
| 68 | ) | 73 | ) |
| 69 | for entry in json.loads(result.stdout): | 74 | for entry in json.loads(result.stdout): |
| 70 | if entry.get("key") == f"{key_type} {key}": | 75 | if same_public_key(entry.get("key", "")): |
| 71 | knot_did = entry.get("did") | 76 | knot_did = entry.get("did") |
| 72 | break | 77 | break |
| 73 | except: | 78 | except: |
config/xmpp/conf.d/paperclover.cfg.lua+7| ... | @@ -7,6 +7,10 @@ contact_info = { | ... | @@ -7,6 +7,10 @@ contact_info = { |
| 7 | } | 7 | } |
| 8 | 8 | ||
| 9 | modules_enabled:append({ | 9 | modules_enabled:append({ |
| 10 | "pep"; | ||
| 11 | "mam"; | ||
| 12 | "carbons"; | ||
| 13 | "offline"; | ||
| 10 | "cloud_notify"; | 14 | "cloud_notify"; |
| 11 | "smacks"; | 15 | "smacks"; |
| 12 | "csi"; | 16 | "csi"; |
| ... | @@ -14,3 +18,6 @@ modules_enabled:append({ | ... | @@ -14,3 +18,6 @@ modules_enabled:append({ |
| 14 | "server_contact_info"; | 18 | "server_contact_info"; |
| 15 | "websocket"; | 19 | "websocket"; |
| 16 | }) | 20 | }) |
| 21 | |||
| 22 | default_archive_policy = true | ||
| 23 | archive_expires_after = "never" |