diff options
| author | makefu <github@syntax-fehler.de> | 2020-06-07 19:51:47 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2020-06-07 19:51:47 +0200 |
| commit | 8dc4c3d153f4f6536815dbb122bf5465ed3a800a (patch) | |
| tree | 584ff99e146b1b1a40ff1b2ab026de00a984eb0d /krebs/3modules | |
| parent | 54502928f633568c694cac94dfd4de527c8414bc (diff) | |
| parent | 8ae780cf2689a0e62718fe0dcc8b80e584f68d23 (diff) | |
Merge remote-tracking branch 'tv/master'
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/github-known-hosts.nix | 36 | ||||
| -rw-r--r-- | krebs/3modules/lass/default.nix | 1 |
2 files changed, 27 insertions, 10 deletions
diff --git a/krebs/3modules/github-known-hosts.nix b/krebs/3modules/github-known-hosts.nix index bae8b96bf..39b9722ec 100644 --- a/krebs/3modules/github-known-hosts.nix +++ b/krebs/3modules/github-known-hosts.nix @@ -29,21 +29,37 @@ "140.82.126.*" "140.82.127.*" "13.114.40.48" - "13.229.188.59" + "52.192.72.89" + "52.69.186.44" + "15.164.81.167" + "52.78.231.108" "13.234.176.102" "13.234.210.38" + "13.229.188.59" + "13.250.177.223" + "52.74.223.119" "13.236.229.21" "13.237.44.5" - "13.250.177.223" - "15.164.81.167" - "18.194.104.89" - "18.195.85.27" - "35.159.8.160" - "52.192.72.89" "52.64.108.95" - "52.69.186.44" - "52.74.223.119" - "52.78.231.108" + "18.228.52.138" + "18.228.67.229" + "18.231.5.6" + "18.181.13.223" + "54.238.117.237" + "54.168.17.15" + "3.34.26.58" + "13.125.114.27" + "3.7.2.84" + "3.6.106.81" + "18.140.96.234" + "18.141.90.153" + "18.138.202.180" + "52.63.152.235" + "3.105.147.174" + "3.106.158.203" + "54.233.131.104" + "18.231.104.233" + "18.228.167.86" ]; publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ=="; }; diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index 00847071a..9c2c0e94c 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -30,6 +30,7 @@ in { 60 IN NS ns16.ovh.net. 60 IN NS dns16.ovh.net. 60 IN A ${config.krebs.hosts.prism.nets.internet.ip4.addr} + IN MX 5 lassul.us. 60 IN TXT v=spf1 mx a:lassul.us -all 60 IN TXT ( "v=DKIM1; k=rsa; t=s; s=*; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDUv3DMndFellqu208feABEzT/PskOfTSdJCOF/HELBR0PHnbBeRoeHEm9XAcOe/Mz2t/ysgZ6JFXeFxCtoM5fG20brUMRzsVRxb9Ur5cEvOYuuRrbChYcKa+fopu8pYrlrqXD3miHISoy6ErukIYCRpXWUJHi1TlNQhLWFYqAaywIDAQAB" ) default._domainkey 60 IN TXT "k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDUv3DMndFellqu208feABEzT/PskOfTSdJCOF/HELBR0PHnbBeRoeHEm9XAcOe/Mz2t/ysgZ6JFXeFxCtoM5fG20brUMRzsVRxb9Ur5cEvOYuuRrbChYcKa+fopu8pYrlrqXD3miHISoy6ErukIYCRpXWUJHi1TlNQhLWFYqAaywIDAQAB" |