summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2017-07-18 13:36:58 -0700
committerMicah Anderson <micah@riseup.net>2017-07-18 13:36:58 -0700
commitbe84761e1cb8a5b7725172529676156c374f4887 (patch)
tree1009a08cbe0a8adadfe41b8b5cec9e6040525f4d
parent49ea117c038f34eff237081a5e43d2d5914a5c1e (diff)
add .gitattributes to ignore secrets, regen dh params
-rw-r--r--.gitattributes9
-rw-r--r--files/ca/dh.pem34
2 files changed, 26 insertions, 17 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..aac013e
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,9 @@
+# No diff, no email for key files
+*.key -diff
+*.pem -diff
+
+# Discard diff for secrets.json
+secrets.json -diff
+
+# No diff for hiera files, they contain passwords
+hiera/* -diff
diff --git a/files/ca/dh.pem b/files/ca/dh.pem
index c3c1516..93e2add 100644
--- a/files/ca/dh.pem
+++ b/files/ca/dh.pem
@@ -1,19 +1,19 @@
-----BEGIN DH PARAMETERS-----
-MIIDDQKCAYEAhIcg0xhUusSNbrAdDVJU+YZ/O83CLcCf38lJdG8rrqzRacjGzxKM
-1godXXDqJIv3EVeDtYqITkZN6gOMC4DQratPyLPuXxllj820SesEiWgNdl8/lyp4
-Jh8bB8zd68yY4Sl2dUka5OVibdZnsbgoKleImVwwaeAvZSECYlhV6HKQNyK+bMja
-EJeR88xaJsLelNixO+NMLqvIoTj24qOc3A5np2YOfsHtmFb1scBP5Jh/t5hOz+/V
-MAy0fRzW81ZFgrV/JMBBM/YweOtRifks2jay3dGpa7tWpAGo78BIPQWg0F4ajhI0
-4+wwBpymJR/paiIvh5VEx+dEdVzD39rWWfuplZyHLtJgwx49lkQGXJjHHeTXvwji
-uvIS5kcEKhQioud+alYY+lJcCEmHUuDBikPSyPmJVNeDd9cRvjuD2MQv/L+iZ8IN
-yPcB+TTgqZaDWOWIe6sqyG7vGg+P5rtswRZPA/7YSrdOt2hKqmErGPKHL41bQUu4
-v/CTD/xf5pWfAoIBgDYUElLXOy90o+SyYC9e0ZnHFWcej1Wqy3FdT3dm509/FNf2
-jQB/XOVu865FenX5GiDSJAFw4wu41Ibx4aHIA7gfBXVyswvLj7R4cDBxQxIUG9tf
-8qL53Gr8e+vTGgl/cUVY7FcSDxzekPdlo1qBkVFSBtgLOlctfbLv0ZKnMwbZp/QZ
-f8cIc3UA/2fBmoC6yDNSjPD41mxZtJAbZmYdQnntOV30PRv2cxrUpSVPOyUFtdS2
-wa1wIVFQPHca/Gucw5z6VFxTmmp3Je9oUgAFfIKMaRnRdDENNwX9GkzYTEoH5HsH
-AvUtpItBDEy+4ZSTOYX/YRI//3ZCkbRAlEjxfBGM6Jxsm2rRAUT68sL0Mt++nAFu
-70dlbHIRRYRsHpXJ58vrEyzyeeaHzcWVMjYPekIGPx6pU0Eqg8raQj0LV836AWZ4
-bVSahHkSKkhg95DQzV9eymfx/wW6LXZvZx2fAdmPxhRIOzW5pUtqpLdg770EFUMk
-FoGN5pOkPzDkzERtDwICAQA=
+MIIDDgKCAYEAuJGDatHWWWtZbT+s7DpOHhPu3wQ5dqsEU/gKhpv4mwmq2ZF13zJM
+jjwRRHmky9zk2K+1RligGbO04qKYdecgk/xIj02flczkQpGCLsOWQB3nW+f7wjEj
+v4P6hYkYEYiJGmuVl/yfowUuhfzyl/5G/fu/cEvjj2738bOxI0xO++LEgeF3husV
+9lfyU7qyKYtZk1XK/z2rfs9rLUhI44EFGmlqwdqtpAvRKdMphkzGcgZwRx5c8XGb
+Jc+rDvIVOevF3otDw2GZ9fn9NGUKVwmsavgnF2JJMLTCMqA36SlmJjVRRVIC0KA3
+lI2H/CsrQO/QVcgHWYmc/BZ60w5wouYiy/cjYT+lXHNLt8e9XO20HtqGT+u3AcF7
+KlPlCeA2KWcgdeurY136I3sj8L5MtqLquV7TqDgwKEaJMJdt5zV/HVTmZ/Zl6NvC
+en4lsjNXJXxnOjsol4t4NvdbEretOfsw6Rp0cXguAkPuHynqPx6sy+fCazP66WhA
+HERf8i1DzbjjAoIBgQCaO2A29WnggYTH8xHqVgMnVLUJT3sbf4RNHYlwZnW1cYep
+OewAuUP3c006ok6pYUy2sQJITOKrkapWloXSCPasbNNhbTGh7ucsh+CGcoW3awsc
+02TsJMrChOP5ArblxFCLYDnbtg0hwnJQhFAhVJjLaxUgiE11lYMAxNZ4dFn4aPrg
+X8x71YBMB0uJmB5WtKVZ3714D8OXy01Pet/CteMsM1E080TrA8BUKA4F8yNHM7tW
+gmV7vYfVVOyhJSmExXSYYCJkF55bZdCnMTjO/oZWls1/h2tGk4u/ZC31Ult6UV1T
+vzo0bR/uHfJVVPUxgU2cTNLNMLx53KoYOWFOibBzerUPGMjnGtQcHYB8JJ06zEZX
+YtHqBauExuwVFGL8lEri3drt/Ogjd/1+gYdckuRJ3e39ho4cf3ALfmil40zrg3FS
+/NolI7+7tdlNtS41m9ePdZWyMNhp9HubRgv9rKCk8LRJVIcCwrG6OM28xru5wfrJ
+P90a+qMD8L3AiVetZboCAgEA
-----END DH PARAMETERS-----