capistrano-apache 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f375849f1c1737c5216bf52f2bc11f9d7e9fbb734a70501e7c8c63eb8cd8ef13
-  data.tar.gz: 4b900fbcb87df9dd5f23da7f37369abc949532d6efcbabab430ed3059817781a
+  metadata.gz: c0db08b81bd2bcaef3ea610b19b42108736a038efd34173d7e00f4331789e1ab
+  data.tar.gz: bac4c2b9d0995f4ac17714ef65977f32ce98019ac9f385c8515ac6674989261e
 SHA512:
-  metadata.gz: 6ce9f1f923cf67945702813a0b1cb5dca896ebb28121cb3dd9d481f59ceda692cc67a89105aca65642c5af66adc5403fd3bceee0dbab07363627391e736a92e2
-  data.tar.gz: cae603a6e76a7f83c1492e9cfeebe01ed668e82def065bab032cd2a66d5df32d808903d5b34f6e660b96de3c179ba2b22971f31fff53d8a2c4fa85a51d6c6295
+  metadata.gz: 2e3a9fe06a669a0d76c8216f0e718b9bb7163be6e58005806cb8d68dfa0d15ee4d3c733178a44826cb34c975c983cd8924dbf1bafe412643e1450abcc5e9c66b
+  data.tar.gz: 3c9580b14928efb1c2d57ac168abda60348fa4563a8bf0b5d659c00ca54fe873c5744278ea470892b0ed2f7b21df38b3afe8d6407939ff14f8c7cee075a39c31

data/CHANGELOG.md

@@ -1,2 +1,5 @@
-### v0.1.0, 2018-01-02
+### v3.0.0, 2018-01-27
+- Rewrite of systemd/sysv_upstart require structure
+- New :systemctl_location and :apache_service_name you can set for httpd or apache2
+### v2.0.0, 2018-01-02
 - Functional for sysv, upstart, and systemd apache2 and httpd environments

data/README.md

@@ -1,13 +1,13 @@
 # Capistrano Apache
 
 Official Capistrano extension for Apache tasks.
+Supports httpd and apache2 (see Configuration below)
 This replaces 1.0.0 of https://rubygems.org/gems/capistrano-apache. *It differs greatly in configuration.*
 
 ### Environments Supported
-|  | systemd | sysv & upstart |
-| ---- | ------- | -------------- |
-| HTTPD | ```capistrano/apache/systemd/httpd``` | ```capistrano/apache/sysv_upstart/httpd``` |
-| APACHE2 | ```capistrano/apache/systemd/apache2``` | ```capistrano/apache/systemd/apache2``` |
+| systemd | sysv & upstart |
+| ------- | -------------- |
+| ```capistrano/apache/systemd``` | ```capistrano/apache/sysv_upstart``` |
 
 ## Installation
 
@@ -20,10 +20,10 @@ gem 'capistrano-apache'
 
 ## Usage
 
-Require one of the above modules (Environments Supported) in your `Capfile`:
+Require one of the above 'Environments Supported' in your `Capfile`:
 
 ```ruby
-require 'capistrano/apache/systemd/httpd'
+require 'capistrano/apache/systemd'
 ```
 
 `capistrano/apache` comes with 5 tasks:
@@ -56,6 +56,8 @@ Configurable options shown here are also the defaults:
 ```ruby
 set :apache_with_sudo, true
 set :apache_roles, :web
+set :apache_service_name, 'httpd' # Specify apache2 here if needed
+set :systemctl_location, '/bin/systemctl' # May already exist if you use other plugins. Be sure to check your config/deploy/{env} file
 ```
 
 ### More Capistrano automation?

data/lib/capistrano/apache/apache.rake

@@ -2,5 +2,7 @@ namespace :load do
   task :defaults do
     set :apache_with_sudo, true
     set :apache_roles, :web
+    set :apache_service_name, 'httpd'
+    set :systemctl_location, '/bin/systemctl'
   end
 end

data/lib/capistrano/apache/systemd.rb

@@ -0,0 +1,2 @@
+load File.expand_path('../apache.rake', __FILE__) # Load configuration options
+load File.expand_path('../tasks/systemd.rake', __FILE__)

data/lib/capistrano/apache/sysv_upstart.rb

@@ -0,0 +1,2 @@
+load File.expand_path('../apache.rake', __FILE__) # Load configuration options
+load File.expand_path('../tasks/sysv_upstart.rake', __FILE__)

data/lib/capistrano/apache/tasks/systemd.rake

@@ -0,0 +1,38 @@
+namespace :apache do
+  desc 'Reload apache (requires root access to apache reload)'
+  task :reload do
+    on release_roles(fetch(:apache_roles)) do
+      fetch(:apache_with_sudo) ? execute(:sudo, fetch(:systemctl_location), "reload #{fetch(:apache_service_name)}.service"): execute(fetch(:systemctl_location), "reload #{fetch(:apache_service_name)}.service")
+    end
+  end
+
+  desc 'Force reload apache (requires root access to apache reload)'
+  task :force_reload do
+    on release_roles(fetch(:apache_roles)) do
+      fetch(:apache_with_sudo) ? execute(:sudo, fetch(:systemctl_location), "force-reload #{fetch(:apache_service_name)}.service") : execute(fetch(:systemctl_location), "force-reload #{fetch(:apache_service_name)}.service")
+    end
+  end
+
+  desc 'Stop apache (requires root access to apache stop)'
+  task :stop do
+    on release_roles(fetch(:apache_roles)) do
+      fetch(:apache_with_sudo) ? execute(:sudo, fetch(:systemctl_location), "stop #{fetch(:apache_service_name)}.service") : execute(fetch(:systemctl_location), "stop #{fetch(:apache_service_name)}.service")
+    end
+  end
+
+  desc 'Start apache (requires root access to apache start)'
+  task :start do
+    on release_roles(fetch(:apache_roles)) do
+      fetch(:apache_with_sudo) ? execute(:sudo, fetch(:systemctl_location), "start #{fetch(:apache_service_name)}.service") : execute(fetch(:systemctl_location), "start #{fetch(:apache_service_name)}.service")
+    end
+  end
+
+  desc 'Restart apache (requires root access to apache restart)'
+  task :restart do
+    on release_roles(fetch(:apache_roles)) do
+      fetch(:apache_with_sudo) ? execute(:sudo, fetch(:systemctl_location), "restart #{fetch(:apache_service_name)}.service") : execute(fetch(:systemctl_location), "restart #{fetch(:apache_service_name)}.service")
+    end
+  end
+end
+
+

data/lib/capistrano/apache/tasks/sysv_upstart.rake

@@ -0,0 +1,36 @@
+namespace :apache do
+  desc 'Reload apache'
+  task :reload do
+    on release_roles(fetch(:apache_roles)) do
+      fetch(:apache_with_sudo) ? execute(:sudo, "/etc/init.d/#{fetch(:apache_service_name)}", 'reload') : execute("/etc/init.d/#{fetch(:apache_service_name)}", 'reload')
+    end
+  end
+
+  desc 'Force reload apache'
+  task :force_reload do
+    on release_roles(fetch(:apache_roles)) do
+      fetch(:apache_with_sudo) ? execute(:sudo, "/etc/init.d/#{fetch(:apache_service_name)}", 'force-reload') : execute("/etc/init.d/#{fetch(:apache_service_name)}", 'force-reload')
+    end
+  end
+
+  desc 'Stop apache'
+  task :stop do
+    on release_roles(fetch(:apache_roles)) do
+      fetch(:apache_with_sudo) ? execute(:sudo, "/etc/init.d/#{fetch(:apache_service_name)}", 'stop') : execute("/etc/init.d/#{fetch(:apache_service_name)}", 'stop')
+    end
+  end
+
+  desc 'Start apache'
+  task :start do
+    on release_roles(fetch(:apache_roles)) do
+      fetch(:apache_with_sudo) ? execute(:sudo, "/etc/init.d/#{fetch(:apache_service_name)}", 'start') : execute("/etc/init.d/#{fetch(:apache_service_name)}", 'start')
+    end
+  end
+
+  desc 'Restart apache'
+  task :restart do
+    on release_roles(fetch(:apache_roles)) do
+      fetch(:apache_with_sudo) ? execute(:sudo, "/etc/init.d/#{fetch(:apache_service_name)}", 'restart') : execute("/etc/init.d/#{fetch(:apache_service_name)}", 'restart')
+    end
+  end
+end

data/lib/capistrano/apache/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Apache
-    VERSION = '2.0.0'
+    VERSION = '3.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-apache
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Sullivan Senechal, Nathan Pierce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-09 00:00:00.000000000 Z
+date: 2018-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -55,14 +55,10 @@ files:
 - Rakefile
 - capistrano-apache.gemspec
 - lib/capistrano/apache/apache.rake
-- lib/capistrano/apache/systemd/apache2.rb
-- lib/capistrano/apache/systemd/httpd.rb
-- lib/capistrano/apache/systemd/tasks/apache2.rake
-- lib/capistrano/apache/systemd/tasks/httpd.rake
-- lib/capistrano/apache/sysv_upstart/apache2.rb
-- lib/capistrano/apache/sysv_upstart/httpd.rb
-- lib/capistrano/apache/sysv_upstart/tasks/apache2.rake
-- lib/capistrano/apache/sysv_upstart/tasks/httpd.rake
+- lib/capistrano/apache/systemd.rb
+- lib/capistrano/apache/sysv_upstart.rb
+- lib/capistrano/apache/tasks/systemd.rake
+- lib/capistrano/apache/tasks/sysv_upstart.rake
 - lib/capistrano/apache/version.rb
 homepage: https://github.com/capistrano-plugins/capistrano-apache
 licenses:

data/lib/capistrano/apache/systemd/apache2.rb

@@ -1,2 +0,0 @@
-load File.expand_path('../../apache.rake', __FILE__) # Load configuration options
-load File.expand_path('../tasks/apache2.rake', __FILE__)

data/lib/capistrano/apache/systemd/httpd.rb

@@ -1,2 +0,0 @@
-load File.expand_path('../../apache.rake', __FILE__) # Load configuration options
-load File.expand_path('../tasks/httpd.rake', __FILE__)

data/lib/capistrano/apache/systemd/tasks/apache2.rake

@@ -1,41 +0,0 @@
-command = '/bin/systemctl'
-service_name = 'apache2'
-
-namespace :apache do
-  desc 'Reload apache (requires root access to apache reload)'
-  task :reload do
-    on release_roles(fetch(:apache_roles)) do
-      fetch(:apache_with_sudo) ? execute(:sudo, command, "reload #{service_name}.service") : execute(command, "reload #{service_name}.service")
-    end
-  end
-
-  desc 'Force reload apache (requires root access to apache reload)'
-  task :force_reload do
-    on release_roles(fetch(:apache_roles)) do
-      fetch(:apache_with_sudo) ? execute(:sudo, command, "force-reload #{service_name}.service") : execute(command, "force-reload #{service_name}.service")
-    end
-  end
-
-  desc 'Stop apache (requires root access to apache stop)'
-  task :stop do
-    on release_roles(fetch(:apache_roles)) do
-      fetch(:apache_with_sudo) ? execute(:sudo, command, "stop #{service_name}.service") : execute(command, "stop #{service_name}.service")
-    end
-  end
-
-  desc 'Start apache (requires root access to apache start)'
-  task :start do
-    on release_roles(fetch(:apache_roles)) do
-      fetch(:apache_with_sudo) ? execute(:sudo, command, "start #{service_name}.service") : execute(command, "start #{service_name}.service")
-    end
-  end
-
-  desc 'Restart apache (requires root access to apache restart)'
-  task :restart do
-    on release_roles(fetch(:apache_roles)) do
-      fetch(:apache_with_sudo) ? execute(:sudo, command, "restart #{service_name}.service") : execute(command, "restart #{service_name}.service")
-    end
-  end
-end
-
-

data/lib/capistrano/apache/systemd/tasks/httpd.rake

@@ -1,41 +0,0 @@
-command = '/bin/systemctl'
-service_name = 'httpd'
-
-namespace :apache do
-  desc 'Reload apache (requires root access to apache reload)'
-  task :reload do
-    on release_roles(fetch(:apache_roles)) do
-      fetch(:apache_with_sudo) ? execute(:sudo, command, "reload #{service_name}.service"): execute(command, "reload #{service_name}.service")
-    end
-  end
-
-  desc 'Force reload apache (requires root access to apache reload)'
-  task :force_reload do
-    on release_roles(fetch(:apache_roles)) do
-      fetch(:apache_with_sudo) ? execute(:sudo, command, "force-reload #{service_name}.service") : execute(command, "force-reload #{service_name}.service")
-    end
-  end
-
-  desc 'Stop apache (requires root access to apache stop)'
-  task :stop do
-    on release_roles(fetch(:apache_roles)) do
-      fetch(:apache_with_sudo) ? execute(:sudo, command, "stop #{service_name}.service") : execute(command, "stop #{service_name}.service")
-    end
-  end
-
-  desc 'Start apache (requires root access to apache start)'
-  task :start do
-    on release_roles(fetch(:apache_roles)) do
-      fetch(:apache_with_sudo) ? execute(:sudo, command, "start #{service_name}.service") : execute(command, "start #{service_name}.service")
-    end
-  end
-
-  desc 'Restart apache (requires root access to apache restart)'
-  task :restart do
-    on release_roles(fetch(:apache_roles)) do
-      fetch(:apache_with_sudo) ? execute(:sudo, command, "restart #{service_name}.service") : execute(command, "restart #{service_name}.service")
-    end
-  end
-end
-
-

data/lib/capistrano/apache/sysv_upstart/apache2.rb

@@ -1,2 +0,0 @@
-load File.expand_path('../../apache.rake', __FILE__) # Load configuration options
-load File.expand_path('../tasks/apache2.rake', __FILE__)

data/lib/capistrano/apache/sysv_upstart/httpd.rb

@@ -1,2 +0,0 @@
-load File.expand_path('../../apache.rake', __FILE__) # Load configuration options
-load File.expand_path('../tasks/httpd.rake', __FILE__)

data/lib/capistrano/apache/sysv_upstart/tasks/apache2.rake

@@ -1,39 +0,0 @@
-service_name = 'apache2'
-command = "/etc/init.d/#{service_name}"
-
-namespace :apache do
-  desc 'Reload apache (requires root access to apache reload)'
-  task :reload do
-    on release_roles(fetch(:apache_roles)) do
-      fetch(:apache_with_sudo) ? execute(:sudo, command, 'reload') : execute(command, 'reload')
-    end
-  end
-
-  desc 'Force reload apache (requires root access to apache reload)'
-  task :force_reload do
-    on release_roles(fetch(:apache_roles)) do
-      fetch(:apache_with_sudo) ? execute(:sudo, command, 'force-reload') : execute(command, 'force-reload')
-    end
-  end
-
-  desc 'Stop apache (requires root access to apache stop)'
-  task :stop do
-    on release_roles(fetch(:apache_roles)) do
-      fetch(:apache_with_sudo) ? execute(:sudo, command, 'stop') : execute(command, 'stop')
-    end
-  end
-
-  desc 'Start apache (requires root access to apache start)'
-  task :start do
-    on release_roles(fetch(:apache_roles)) do
-      fetch(:apache_with_sudo) ? execute(:sudo, command, 'start') : execute(command, 'start')
-    end
-  end
-
-  desc 'Restart apache (requires root access to apache restart)'
-  task :restart do
-    on release_roles(fetch(:apache_roles)) do
-      fetch(:apache_with_sudo) ? execute(:sudo, command, 'restart') : execute(command, 'restart')
-    end
-  end
-end

data/lib/capistrano/apache/sysv_upstart/tasks/httpd.rake

@@ -1,39 +0,0 @@
-service_name = 'httpd'
-command = "/etc/init.d/#{service_name}"
-
-namespace :apache do
-  desc 'Reload apache (requires root access to apache reload)'
-  task :reload do
-    on release_roles(fetch(:apache_roles)) do
-      fetch(:apache_with_sudo) ? execute(:sudo, command, 'reload') : execute(command, 'reload')
-    end
-  end
-
-  desc 'Force reload apache (requires root access to apache reload)'
-  task :force_reload do
-    on release_roles(fetch(:apache_roles)) do
-      fetch(:apache_with_sudo) ? execute(:sudo, command, 'force-reload') : execute(command, 'force-reload')
-    end
-  end
-
-  desc 'Stop apache (requires root access to apache stop)'
-  task :stop do
-    on release_roles(fetch(:apache_roles)) do
-      fetch(:apache_with_sudo) ? execute(:sudo, command, 'stop') : execute(command, 'stop')
-    end
-  end
-
-  desc 'Start apache (requires root access to apache start)'
-  task :start do
-    on release_roles(fetch(:apache_roles)) do
-      fetch(:apache_with_sudo) ? execute(:sudo, command, 'start') : execute(command, 'start')
-    end
-  end
-
-  desc 'Restart apache (requires root access to apache restart)'
-  task :restart do
-    on release_roles(fetch(:apache_roles)) do
-      fetch(:apache_with_sudo) ? execute(:sudo, command, 'restart') : execute(command, 'restart')
-    end
-  end
-end