capistrano-apache 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d662a71351f4935be8927f117d748e1b78643c1c
-  data.tar.gz: 89b5c21d7365697220817ed0234e868717d66908
+SHA256:
+  metadata.gz: f375849f1c1737c5216bf52f2bc11f9d7e9fbb734a70501e7c8c63eb8cd8ef13
+  data.tar.gz: 4b900fbcb87df9dd5f23da7f37369abc949532d6efcbabab430ed3059817781a
 SHA512:
-  metadata.gz: 315922b14b0e0b20895ae4855f5f0b7d258885c952d5344fe49142fad40b24a4fea708e44ea1132f8bae054d110fca1a356f196aa8ae5c6cc1da22646d882d4c
-  data.tar.gz: dc01cc2e3ae425ac1b7e11686cb39c5ece76d659c6bdbd659b0499d2938da195aa16bb87fbb2f24ab0d6e5604b9fb9b99be2462da90a8e64dab206da038f043b
+  metadata.gz: 6ce9f1f923cf67945702813a0b1cb5dca896ebb28121cb3dd9d481f59ceda692cc67a89105aca65642c5af66adc5403fd3bceee0dbab07363627391e736a92e2
+  data.tar.gz: cae603a6e76a7f83c1492e9cfeebe01ed668e82def065bab032cd2a66d5df32d808903d5b34f6e660b96de3c179ba2b22971f31fff53d8a2c4fa85a51d6c6295

data/.gitignore

@@ -0,0 +1,4 @@
+.idea
+Gemfile.lock
+*.gem
+.DS_Store

data/CHANGELOG.md

@@ -0,0 +1,2 @@
+### v0.1.0, 2018-01-02
+- Functional for sysv, upstart, and systemd apache2 and httpd environments

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,36 @@
+PATH
+  remote: .
+  specs:
+    capistrano-apache (0.0.1)
+      capistrano (~> 3.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    airbrussh (1.3.0)
+      sshkit (>= 1.6.1, != 1.7.0)
+    capistrano (3.10.1)
+      airbrussh (>= 1.0.0)
+      i18n
+      rake (>= 10.0.0)
+      sshkit (>= 1.9.0)
+    concurrent-ruby (1.0.5)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (4.2.0)
+    rake (10.5.0)
+    sshkit (1.15.1)
+      net-scp (>= 1.1.2)
+      net-ssh (>= 2.8.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  capistrano-apache!
+  rake (~> 10.1)
+
+BUNDLED WITH
+   1.16.0

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Capistrano Plugins
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -0,0 +1,77 @@
+# Capistrano Apache
+
+Official Capistrano extension for Apache tasks.
+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``` |
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'capistrano', '~> 3.2'
+gem 'capistrano-apache'
+```
+
+## Usage
+
+Require one of the above modules (Environments Supported) in your `Capfile`:
+
+```ruby
+require 'capistrano/apache/systemd/httpd'
+```
+
+`capistrano/apache` comes with 5 tasks:
+
+* apache:reload
+* apache:force_reload
+* apache:restart
+* apache:stop
+* apache:zap
+
+You can execute the task on command line:
+ 
+```bash
+cap production apache:reload
+```
+
+And configure it on your `deploy.rb` file:
+
+```ruby
+namespace :deploy do
+  after :finishing, 'apache:reload'
+  after :rollback, 'apache:reload'
+end
+```
+
+### Configuration
+
+Configurable options shown here are also the defaults:
+
+```ruby
+set :apache_with_sudo, true
+set :apache_roles, :web
+```
+
+### More Capistrano automation?
+
+Check out [capistrano-plugins](https://github.com/capistrano-plugins) github org.
+
+### Contributing and bug reports
+
+Contributions and improvements are very welcome.
+
+If something is not working for you, or you find a bug please report it.
+
+### Thanks
+
+* [Sullivan Senechal](https://github.com/Soullivaneuh) @ [NexyLan](https://www.nexylan.com) - Original creator of sysv & upstart code plugin this is heavily based on
+
+### License
+
+[MIT](LICENSE.md)

data/Rakefile

@@ -0,0 +1 @@
+require 'bundler/gem_tasks'

data/capistrano-apache.gemspec

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'capistrano/apache/version'
+
+Gem::Specification.new do |gem|
+  gem.name          = 'capistrano-apache'
+  gem.version       = Capistrano::Apache::VERSION
+  gem.summary       = 'Capistrano extension for Apache tasks using systemd'
+  gem.description   = 'Executes Apache service tasks like reload or restart from Capistrano'
+  gem.authors       = ['Sullivan Senechal, Nathan Pierce']
+  gem.email         = ['soullivaneuh@gmail.com','connarpierce@gmail.com']
+  gem.homepage      = 'https://github.com/capistrano-plugins/capistrano-apache'
+  gem.license       = 'MIT'
+
+  gem.files         = `git ls-files`.split($/)
+  gem.require_paths = ['lib']
+
+  gem.add_dependency 'capistrano', '~> 3.2'
+  gem.add_development_dependency 'rake', '~> 10.1'
+end

data/lib/capistrano/apache/apache.rake

@@ -0,0 +1,6 @@
+namespace :load do
+  task :defaults do
+    set :apache_with_sudo, true
+    set :apache_roles, :web
+  end
+end

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

@@ -0,0 +1,2 @@
+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

@@ -0,0 +1,2 @@
+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

@@ -0,0 +1,41 @@
+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

@@ -0,0 +1,41 @@
+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

@@ -0,0 +1,2 @@
+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

@@ -0,0 +1,2 @@
+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

@@ -0,0 +1,39 @@
+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/{tasks/apache.rake → apache/sysv_upstart/tasks/httpd.rake}

@@ -1,44 +1,39 @@
+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
-      execute :apache, 'reload'
+      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
-      execute :apache, 'force-reload'
+      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
-      execute :apache, 'stop'
+      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
-      execute :apache, 'start'
+      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
-      execute :apache, 'restart'
+      fetch(:apache_with_sudo) ? execute(:sudo, command, 'restart') : execute(command, 'restart')
     end
   end
-end
-
-namespace :load do
-  task :defaults do
-    set :apache_roles, :all
-  end
-end
-
-SSHKit.config.command_map[:apache] = 'sudo /etc/init.d/apache2'
+end

data/lib/capistrano/apache/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-apache
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
-- Sullivan Senechal
+- Sullivan Senechal, Nathan Pierce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2018-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -41,13 +41,30 @@ dependencies:
 description: Executes Apache service tasks like reload or restart from Capistrano
 email:
 - soullivaneuh@gmail.com
+- connarpierce@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/capistrano/apache.rb
-- lib/capistrano/tasks/apache.rake
-homepage: https://github.com/nexylan/capistrano-apache
+- ".gitignore"
+- CHANGELOG.md
+- Gemfile
+- Gemfile.lock
+- LICENSE
+- README.md
+- 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/version.rb
+homepage: https://github.com/capistrano-plugins/capistrano-apache
 licenses:
 - MIT
 metadata: {}
@@ -67,8 +84,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
-summary: Capistrano extension for Apache tasks
+summary: Capistrano extension for Apache tasks using systemd
 test_files: []

data/lib/capistrano/apache.rb

@@ -1 +0,0 @@
-load File.expand_path('../tasks/apache.rake', __FILE__)