From 7d6ae95020a59a5586453607c6c4990a8f60f209 Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sun, 3 Nov 2019 16:05:26 +0800 Subject: [PATCH] Generate `ticket.key` by `nginx` cookbook. --- cookbooks/blog/default.rb | 1 - cookbooks/blog/files/etc/cron.d/blog | 1 - cookbooks/blog/ssl.rb | 8 -------- cookbooks/nginx/files/etc/cron.d/lego | 19 ++++++++++--------- 4 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 cookbooks/blog/ssl.rb diff --git a/cookbooks/blog/default.rb b/cookbooks/blog/default.rb index d41bb85..e17ba34 100644 --- a/cookbooks/blog/default.rb +++ b/cookbooks/blog/default.rb @@ -1,6 +1,5 @@ include_recipe './attributes.rb' if node['blog']['production'] - include_recipe './ssl.rb' include_recipe './nginx.rb' end diff --git a/cookbooks/blog/files/etc/cron.d/blog b/cookbooks/blog/files/etc/cron.d/blog index 0418f45..5374f8c 100644 --- a/cookbooks/blog/files/etc/cron.d/blog +++ b/cookbooks/blog/files/etc/cron.d/blog @@ -1,2 +1 @@ @reboot webadm cp -pr /home/webadm/works/public/* /var/www/blog/ -12 3 * * * root openssl rand 48 > /etc/letsencrypt/live/blog.kazu634.com/ticket.key diff --git a/cookbooks/blog/ssl.rb b/cookbooks/blog/ssl.rb deleted file mode 100644 index ed9b535..0000000 --- a/cookbooks/blog/ssl.rb +++ /dev/null @@ -1,8 +0,0 @@ -remote_file "/etc/lego/dhparams_4096.pem" do - owner 'root' - group 'root' - mode '444' -end - -execute "openssl rand 48 > /etc/lego/ticket.key" - diff --git a/cookbooks/nginx/files/etc/cron.d/lego b/cookbooks/nginx/files/etc/cron.d/lego index 5270ae4..fa1700f 100644 --- a/cookbooks/nginx/files/etc/cron.d/lego +++ b/cookbooks/nginx/files/etc/cron.d/lego @@ -1,9 +1,10 @@ -md5:57b921ce69f66f9e8a55f701b6ba1280:salt:181-24-185-209-50-114-63-114:aes-256-cfb:wvv7sg+fdPPpfs6v8NeRSCVXCLpdVrcsI5jr1ct959oIDy2E9mip1wEEt00v -fP+9XCrHZnRG9aXy7jdVHZfuLI9Pw9ADqL7kJK35CQAue6LKHewSDnwr64CN -aFaw5pNSdnMpvGvzZiPe0nsqWTucsHl/0/BsnFNYBSdLRH2IZcYG2Do8iYbl -loml6MZ+Lfaf1YEMUREKkPwNn+vq3eC4ihLd/fs2n21tlq9DBGbTlsL37k/D -3sIea62lB2uym+3fi4vaSvP4MvYedaJ8WcXYFINMh4miTYMmXCUHLPiDJrX+ -YEVO6QU00psjCqXj/kpYPVhvJRg74E9S6cKfsT/ZDJG7Blm95aVnTEgG2fJV -MG19BdzXIE/4qrqclFO0A7s/syl9vCC+jecqmP7jWnDiO3eVvPrmr0XHfuIE -owMUMLnUGfQqK7AS5oYKDEa2g30o44U/PljI91B9jYXwScny0S6g+NRZBZcP -vG+o4g2oGTVwVrXc \ No newline at end of file +md5:30a0e77addb4f453a88596f1d19c504d:salt:179-208-102-156-63-139-97-68:aes-256-cfb:lH4eJhn7bmGIA2yV3C9OC3nPS7fFs9gewhGr8ZnGwcJy12EHYkrRhgJOJbyv +Rn7vyHEbHWUpcTI6PdYs7HX+7OjxiNTkEvagc8DwGegy9TUcnDLwoeyXzX9o +MU4/DI3B06wguG04HRpv3428uF1r6a+wNbi1CGaTfFqIDlTFW920BM7vEKhn +HrvLrO6m8mCHpqfCFUF7UPIUx+0DhfH9yCfqIa0Wz+x7QwEGdzXJY8i8oA1/ +ryV4248P3WVv18GD/Pm3Kjq1LDkjwwgsjFm8m/V1WDL+1uWv6aWILUqdqYge +4hgDgT6TjsovatXsBTGJ21f21J/qlTRvhIXNHs62RAcLglFAShFp6RPY/VMf +mQqccWxKhidms/nqM9Xh+3o8dqhqr8FWMdVlQ1SX/Yi1OzB64e2i1MxiqpvQ +DfCOxJLVo13WuoiDmquuI4PV16ozl1p+0ccaQEDEoQZK0AsOBJJ6aCloSak0 +MMM1+fmvvqB2MaFUUt2txsv/5J1lNVZ3xW6H5veOSFNTXMFBqLPFSjoMDOEs +s+lkHd+AneN5YTUIGxDCpfdsPhginA== \ No newline at end of file