From 69b38552c69b3e72250d5905548c33502db1be5f Mon Sep 17 00:00:00 2001
From: Sebastian Kippe <sebastian@kip.pe>
Date: Mon, 31 Jul 2017 13:00:20 +0200
Subject: [PATCH] Add vapid keys

---
 data_bags/credentials/mastodon.json           | 40 ++++++++++++-------
 .../kosmos-mastodon/recipes/default.rb        |  4 +-
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/data_bags/credentials/mastodon.json b/data_bags/credentials/mastodon.json
index 093ee62..3eb3e7b 100644
--- a/data_bags/credentials/mastodon.json
+++ b/data_bags/credentials/mastodon.json
@@ -1,44 +1,56 @@
 {
   "id": "mastodon",
   "paperclip_secret": {
-    "encrypted_data": "/rai6Zj08FBtOdhpwCuRU6gSvBeYrQ3IiZ+NKCThOB4k7TrJ5/DZ+Jl3Pz1l\n3yJ1QfVf8w5dBLiGFmlimEu0uMi4fQohTdpi4pIczARneH5M9pN6jY2ZkMoy\nnmuO95bKGgX4GZi33F3T+XwwEQ3LPm+a6Ml2S7Ycffcx2xbNqTH5e/lWX3qF\ngDYZZR+R9g0GSQ2L+pZAdRMxDZz/WufBSA==\n",
-    "iv": "nsdbLOcJOHGAt4T/R+bwDA==\n",
+    "encrypted_data": "4IAa8NMwj25MksFkh79r/Gf0ev2bKP9g5Gbz0MZLK8JxekM9+qRSes1bZK1q\nuV+/W/KxQW22GgRCNu6heimGUTnaIM2T5oneCwikDWJPMO11ngiAKkzeJWI9\nxhecxAfCyKEZWdwTIB8U9mjDV9GhppmwjLsMdC5nzcAzGzpFfjMZVVsIhmEg\nWuPIz7GPWqn/+G8pG2Q1DR7ZFJZSVYV+ig==\n",
+    "iv": "TQl3HBj/eakZ9nrMygW9pg==\n",
     "version": 1,
     "cipher": "aes-256-cbc"
   },
   "secret_key_base": {
-    "encrypted_data": "uvrKsWy+34xFMoC82n6nx2bjZyx1qseHm3mg7FvC5XzyTomc3km0jdr0cGo8\ngydAwZU5rOB3vX+eA2vqipRbROUboOoSahAxfzDI3187NgBhZgcootsmVqaB\njPs0y1un2C6YCF8owT/eTMnqta+Sfzyc+1fWSYQtoWVgoEejc54gyGB+vWB0\nxiLoPsDRIYM1LstGu8AdKP77iDYRpAsYsA==\n",
-    "iv": "anBxz01wpEH2iNVWktADYg==\n",
+    "encrypted_data": "hH1860J8V4LFNE2OCG8pIVJd8l3hFZ56n0xONXUd98IAmVodM1Eip5nvyQmp\ntfkzAXfKMR4hUz5Y399Gp67BCh4TLum2oTqcLBF+RFP/52ZcVLESQh+ielC0\nxfUXE5Usf1YVL/gxwbmzp2l7Gr87YIAWCcGySbbb6hK+MVyr8degIHBveF0R\nNeUfRLe0B9Y/ZZGExRej+ULiiEn+c5Fubg==\n",
+    "iv": "+GOTOBWPb72QWX1G1Oaf3g==\n",
     "version": 1,
     "cipher": "aes-256-cbc"
   },
   "otp_secret": {
-    "encrypted_data": "q8BLFwwZU/hoinL8Aizd27fWj2SIBFLmM5n/LBBuUt4q4zuauA4591fkTlPH\n1vihDK9hE4xl90V1t6IIwj3IpBq9w53rfToJrBwxD1l63j41bEvJ39qr8gsh\nbH4xT/rzsyp5cWXrakCDIOuOHBuoFDlJetIY2BLDLXbqDEwFG4CI5YoPn0gV\nCPCNmRKITulem2YjqnGswFd/tvvR2X/w5Q==\n",
-    "iv": "BMjOeH9mAW0J3pRJAMFlKw==\n",
+    "encrypted_data": "UZDcQYsfYJxhuaSDEFKdnC9BIryoJPWo95bbVqFcCDCQxO13iGuN5ZiZ4aUp\nRLMrT/pmnirID9qUQfSRgALR9KUTGonPwF03tO8xCvUCLCS7Y9l9fbIG9xUa\nY3c0b6xfwNLVP1fpax3iNfQSGuJMwTShZO8pCOeDxlhe67KawOw2obNeuTUG\n0wTKdxhywNntoLHnXKNqANZebKtqkcCV6A==\n",
+    "iv": "lMApicoykymve7hcnxx1DQ==\n",
     "version": 1,
     "cipher": "aes-256-cbc"
   },
   "aws_access_key_id": {
-    "encrypted_data": "wSevnv6+7QbJb4HNEaTCXzL+QzcES+QZFjS6gcPxP+JvAnQhhNmf0FwlqGP2\n4gXN\n",
-    "iv": "mVIoUHFYRQUY/u8ZqCdd/w==\n",
+    "encrypted_data": "t2B+oZZcz+EzKFO+BLSzq3oWyGRHQkxiG3NOBWs3bYctgX3Lq24xFZsne9i/\nQmLl\n",
+    "iv": "TU4RGm3Rl8f/wbEkwmlEvQ==\n",
     "version": 1,
     "cipher": "aes-256-cbc"
   },
   "aws_secret_access_key": {
-    "encrypted_data": "ZNBp33pfndINgpyiGpM4nQc1/TeSg2KmeOWGJTaxf6KggKnqN+ZIcW/FhWTN\n0IE1Z4cxBJpzK/voCbeEhZC5Sg==\n",
-    "iv": "p1lGI0p+EOpGcyzATvofCQ==\n",
+    "encrypted_data": "ffOTmy9aiHIc9GIjuTlGkgUL4QnujC2cdeAkXpTEi+VBiYjVybrruDalXg3p\nuDZmSqnWB0sfQgNpp9sCOUqUiQ==\n",
+    "iv": "OnSjyXonCFrq9gGfW/t1TA==\n",
     "version": 1,
     "cipher": "aes-256-cbc"
   },
   "smtp_user_name": {
-    "encrypted_data": "ZbcFLsjQOtrY+5WoK5CFgOywm2HMO5aivoAXLEKIXCh/5NpOJuMWr13RSbhu\n31b/\n",
-    "iv": "t1+hKaEUwRee3LGQ6H0a7g==\n",
+    "encrypted_data": "D9UXRNnvBQOICQ2nFjh+CLAazmeA/avlSuQwikDmYU0VoApXbfmPiUBLIvIF\nUtSy\n",
+    "iv": "nnM8YaTSWUzuVpBJOVn0rA==\n",
     "version": 1,
     "cipher": "aes-256-cbc"
   },
   "smtp_password": {
-    "encrypted_data": "EDmXwQjtqpJpClc+vbe8L+h/599gcTIvIzq2p+T/cY8+qUAYQzZpsvboJiVI\n43YQxYNtJ7Lm784QDhRdbTAEtw==\n",
-    "iv": "cQq5ym70FasDRIMQM5CLSg==\n",
+    "encrypted_data": "edFmMcnLHVEL/hpVslJj6L85WPeC7Wu3/ijTWH93pRZGCchgmcolJCK4S6//\npDz5qKG+KZX7sZLRe5PrAvnwaA==\n",
+    "iv": "1Nffd1NayckQDa83+LNv8w==\n",
+    "version": 1,
+    "cipher": "aes-256-cbc"
+  },
+  "vapid_private_key": {
+    "encrypted_data": "VD+4vZxL1Z3FzQRyPVmowGb0qi6+zz7YCsQPTYUIbW693CKpxOtIkt+f6aXj\n95ENI4CsK4bftUC6nMwL+PK4Yw==\n",
+    "iv": "FE9FzilV00euQiuNxgUgvA==\n",
+    "version": 1,
+    "cipher": "aes-256-cbc"
+  },
+  "vapid_public_key": {
+    "encrypted_data": "2Cg2XN5PCSw/O0WhwAU3KlALWh8NBThdgaeW0faIexgetFozEhLOkwiYqdNa\nK/fTYoW2fQNJLJ/jJ6CcGrgwI3V9qy6u6lJnXQDO51vdz09wXWCZKZTue7NE\n0qGUNrq4Atq9mRTNjQ8eUTImlRO+yg==\n",
+    "iv": "7GeDps0go/IJ7HspQUBAdg==\n",
     "version": 1,
     "cipher": "aes-256-cbc"
   }
diff --git a/site-cookbooks/kosmos-mastodon/recipes/default.rb b/site-cookbooks/kosmos-mastodon/recipes/default.rb
index 7cc1f36..e223f49 100644
--- a/site-cookbooks/kosmos-mastodon/recipes/default.rb
+++ b/site-cookbooks/kosmos-mastodon/recipes/default.rb
@@ -84,7 +84,9 @@ application mastodon_path do
               s3_bucket: "kosmos-social",
               aws_access_key_id: mastodon_credentials['aws_access_key_id'],
               aws_secret_access_key: mastodon_credentials['aws_secret_access_key'],
-              s3_region: "eu-west-1"
+              s3_region: "eu-west-1",
+              vapid_private_key: mastodon_credentials['vapid_private_key'],
+              vapid_public_key: mastodon_credentials['vapid_public_key']
   end
 
   directory "#{mastodon_path}/public/.well-known" do