itamae-plugin-recipe-letsencrypt 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cab6a96bbe1a652752f51cb5c8a2dda729de71d
-  data.tar.gz: f53c61dc7425fda6aa0ed4fddb26559d24c5af97
+  metadata.gz: 6d57482fc3ee6cbc81e4dcad691680b12bd17143
+  data.tar.gz: d4fd1e4c4e72ff288716db58ffb148a17fa9c1df
 SHA512:
-  metadata.gz: ee99ff4816c384bbfa7723a497bfbf3cc1598c318f7ada5bfa0899b1ffc7431e53494f0b6f1eef1ef5cf17d674a3f7a23492a5de3ea81cd75918c89c61f00c81
-  data.tar.gz: e2557da0e30933b3ef02b44a9b19d0f792af5ed6d04885592d336fdad8a30dbf9cc3ae7005a2e1896efbc752350c6d63108ec1054ddba256cf3a10fa4598ad71
+  metadata.gz: 623fcaeaa4a1e8cf5bd67be21b8b1250499a76080bba6011f1e28f9be0dec20f06b0c4fee02fa68180cb8c8f938f2dbb4068ac91461302475c30731211b22824
+  data.tar.gz: 2a7d17b4b81bff06ea8d14ef86e68282d461a598591baf0622d1487607a9e42c58d751551b53131efd92537138f3f28e8d6f45335ac7584b49c5ff5584925304

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v0.2.1 - 2017/01/10
+- Support Amazon Linux
+
 ## v0.2.0 - 2016/12/18
 - Support Standalone Challenge Type
 

data/README.md

@@ -1,6 +1,6 @@
 # Itamae::Plugin::Recipe::Letsencrypt
 
-This gem is [itamae](https://github.com/ryotarai/itamae) plugin.  
+This gem is [itamae](https://github.com/ryotarai/itamae) plugin.
 Get certificate of domain from [Let's Encrypt](https://letsencrypt.org/)
 
 ## Installation
@@ -22,7 +22,7 @@ Or install it yourself as:
 ## Support
 - Debian GNU/Linux 8 (jessie)
 
-I have not confirmed it in other environments yet  
+I have not confirmed it in other environments yet
 I will check in turn
 
 ## Usage
@@ -44,12 +44,16 @@ letsencrypt:
   cron_user: root
   cron_file_path: /etc/cron.d/itamae-letsencrypt
   cron_configuration: true
-  challenge_type: 'http-01' # port80 is http-01, port443 is tls-sni-01 
+  challenge_type: 'http-01' # port80 is http-01, port443 is tls-sni-01
   domains:
     - test.example.com
     - test2.example.com
+  authenticator: standalone # standalone, webroot
+  webroot_path: /var/www/example
+  debug_mode: false
 ```
 
+**Process of the port selected by `challenge_type` needs to be stopped**
 
 
 ## Contributing
@@ -64,4 +68,3 @@ letsencrypt:
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/lib/itamae/plugin/recipe/letsencrypt/cron.rb

@@ -4,10 +4,17 @@ cron_text = <<-EOS
 0 0 1 * * #{node[:letsencrypt][:cron_user]} #{node[:letsencrypt][:certbot_auto_path]} renew
 EOS
 
-execute 'set cron file' do
-  command "echo '#{cron_text}' > #{node[:letsencrypt][:cron_file_path]}"
+file node[:letsencrypt][:cron_file_path] do
+  content cron_text
 end
 
-service "cron" do
+service_name = case node[:platform]
+              when 'amazon'
+                'crond'
+              else
+                'cron'
+              end
+
+service service_name do
   action :start
 end

data/lib/itamae/plugin/recipe/letsencrypt/get.rb

@@ -4,26 +4,47 @@ node.reverse_merge!(
     cron_user: 'root',
     cron_file_path: '/etc/cron.d/itamae-letsencrypt',
     cron_configuration: true,
-    challenge_type: 'http-01'
+    challenge_type: 'http-01',
+    authenticator: 'standalone',
+    debug_mode: false,
   }
 )
 
 execute 'download certbot-auto' do
   command "wget https://dl.eff.org/certbot-auto -O #{node[:letsencrypt][:certbot_auto_path]}"
+  not_if "test -f #{node[:letsencrypt][:certbot_auto_path]}"
 end
 
 execute 'change certbot-auto permission' do
   command "chmod a+x #{node[:letsencrypt][:certbot_auto_path]}"
+  not_if "test -x #{node[:letsencrypt][:certbot_auto_path]}"
 end
 
 execute 'install dependency package' do
-  command "#{node[:letsencrypt][:certbot_auto_path]} -n --os-packages-only"
+  cmd = "#{node[:letsencrypt][:certbot_auto_path]} -n --os-packages-only"
+  cmd << ' --debug' if node[:letsencrypt][:debug_mode]
+  command cmd
+  not_if "test -n \"$(#{cmd} --dry-run | grep 'OS packages installed.')\""
 end
 
 # get each domain certificate
 node[:letsencrypt][:domains].each do |domain|
   execute "get #{domain} certificate" do
-    command "#{node[:letsencrypt][:certbot_auto_path]} certonly --agree-tos -d #{domain} -m #{node[:letsencrypt][:email]} -a standalone --keep -n --standalone-supported-challenges #{node[:letsencrypt][:challenge_type]}"
+    cmd = [
+      node[:letsencrypt][:certbot_auto_path],
+      'certonly',
+      '--agree-tos',
+      "-d #{domain}",
+      "-m #{node[:letsencrypt][:email]}",
+      "-a #{node[:letsencrypt][:authenticator]}",
+      '--keep',
+      '-n',
+      "--preferred-challenges #{node[:letsencrypt][:challenge_type]}",
+    ]
+    cmd << "-w #{node[:letsencrypt][:webroot_path]}" if node[:letsencrypt][:webroot_path]
+    cmd << '--debug' if node[:letsencrypt][:debug_mode]
+    command cmd.join(' ')
+    not_if "test -d /etc/letsencrypt/live/#{domain}"
   end
 end
 

data/lib/itamae/plugin/recipe/letsencrypt/version.rb

@@ -2,7 +2,7 @@ module Itamae
   module Plugin
     module Recipe
       module Letsencrypt
-        VERSION = "0.2.0"
+        VERSION = "0.2.1"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-plugin-recipe-letsencrypt
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Yusaku Hatanaka (hatappi)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-18 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler