deploy_mate 0.25 → 0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4688cb4bbaaac7d4f9ca94f23ceae0c00444bbee
-  data.tar.gz: d4f5f27b8e5934f6762feb513538147663e40e0d
+  metadata.gz: 768e0e7e64a77e1554ddab368e4a8e98de31c483
+  data.tar.gz: 7e5ca262e476219e9952d44fe835601ec6ca606f
 SHA512:
-  metadata.gz: 6efc0d11872ede6f98f931fc4c719794fb173f9ae4ef79986c8998d8318aabbe24fff6e9e091be334b2c8a7c3db6b53c91ec8083ae06124514a89a251a5e5352
-  data.tar.gz: 0afcd367fd83b0ac36871375038d3d72d97b347b9123f17b83aa7c2f603dbf5025993a092c0499ead7d7770e72ec68d8e29d3295ff85db8df221a00259c3451f
+  metadata.gz: 86279a148fed38db0ed1718a090219358a874852cb862be5c4c56a996a4feb218ceb25fb8a5a05da8ac4297b8d3b84d5568f44733125144cb99f10124af70f81
+  data.tar.gz: bf893c4d363d929ca0a6c3c5c82fe7d7767f59a28e7b5c68ec60bcc6385a8f7fbde2575d01f4f1959be5102a00ee095262f0e57723dc5cd979ee63a5d97e1398

data/CHANGELOG.md

@@ -1,3 +1,4 @@
+* **0.26 (2016-05-25)**: Swapped `unattended-upgrades` for `cron-apt` to remove manual labor
 * **0.25 (2016-05-23)**: Support multiple stages in YAML-file.
 * **0.2 (2016-05-18)**: Configuration moved to YAML-file. SSH-Keys optional. Config-templates overwritable locally.
 * **0.18.4 (2016-03-22)**: Added mandatory task to install `ssh_key`s

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    deploy_mate (0.20)
+    deploy_mate (0.25)
       capistrano (~> 3.0)
       capistrano-bundler
       capistrano-rails

data/README.md

@@ -1,4 +1,4 @@
-# The sturdy d'ploy-mate [![Build Status](https://travis-ci.org/johanness/deploy-mate.svg?branch=master)](https://travis-ci.org/johanness/deploy-mate) [![Code Climate](https://codeclimate.com/github/johanness/deploy-mate/badges/gpa.svg)](https://codeclimate.com/github/johanness/deploy-mate)
+# The sturdy d'ploy-mate [![Build Status](https://travis-ci.org/hanseventures/deploy-mate.svg?branch=master)](https://travis-ci.org/hanseventures/deploy-mate) [![Code Climate](https://codeclimate.com/repos/57440ed420a311008900761d/badges/68688d96d13732d3ef41/gpa.svg)](https://codeclimate.com/repos/57440ed420a311008900761d/feed)
 <img src="http://hanseventures.s3.amazonaws.com/github/pirate-redbeard_1024.png" width="300" />
 > T'arrust me, bucko. I can do it.
 

data/deploy-mate.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name                      = "deploy_mate"
-  s.version                   = "0.25"
+  s.version                   = "0.26"
 
   s.authors                   = ["Tim Adler", "Marcus Geißler", "Johannes Strampe"]
-  s.date                      = '2016-05-23'
+  s.date                      = '2016-05-25'
   s.description               = 'This is how we deploy around here.'
   s.summary                   = s.description
   s.email                     = 'development (at) hanseventures (dot) com'

data/lib/capistrano/configs/security_sources_list.erb

@@ -0,0 +1,4 @@
+deb http://security.ubuntu.com/ubuntu trusty-security main
+deb-src http://security.ubuntu.com/ubuntu trusty-security main
+deb http://security.ubuntu.com/ubuntu trusty-security universe
+deb-src http://security.ubuntu.com/ubuntu trusty-security universe

data/lib/capistrano/configs/security_upgrades.erb

@@ -0,0 +1 @@
+upgrade -y -o APT::Get::Show-Upgraded=true -o quiet=1 -o APT::Get::List-Cleanup=false -o Dir::Etc::SourceList=/etc/apt/security.sources.list -o Dir::Etc::SourceParts="/dev/null"

data/lib/capistrano/tasks/machine.rake

@@ -10,7 +10,7 @@ namespace :machine do
     invoke "machine:install:ssh_keys"
     invoke "machine:install:htop"
     invoke "machine:install:language_pack_de"
-    invoke "machine:install:unattended_upgrades"
+    invoke "machine:install:cron_apt"
     invoke "machine:install:ntp"
     invoke "machine:install:git"
     invoke "machine:install:nginx"
@@ -58,9 +58,6 @@ namespace :machine do
     task :set_defaults do
       on roles(:app) do
         execute_script("set_defaults.sh", fetch(:rvm_ruby_version))
-        warn "--------------------------------------------------------------------------------------"
-        warn "Run 'dpkg-reconfigure -plow unattended-upgrades' to enable automatic security updates!"
-        warn "--------------------------------------------------------------------------------------"
       end
     end
 
@@ -177,11 +174,17 @@ namespace :machine do
       end
     end
 
-    task :unattended_upgrades do
+    task :cron_apt do
       on roles(:app) do
-        unless package_installed?("unattended-upgrades")
-          apt_get_install("unattended-upgrades")
-        end
+        apt_get_install("cron-apt") unless is_package_installed?("cron-apt")
+
+        template "security_sources_list.erb", "/tmp/security_sources_list"
+        sudo "mv /tmp/security_sources_list /etc/apt/security.sources.list"
+        sudo "chmod 644 /etc/apt/security.sources.list"
+
+        template "security_upgrades.erb", "/tmp/security_upgrades"
+        sudo "mv /tmp/security_upgrades /etc/cron-apt/action.d/5-security"
+        sudo "chmod 644 /etc/cron-apt/action.d/5-security"
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deploy_mate
 version: !ruby/object:Gem::Version
-  version: '0.25'
+  version: '0.26'
 platform: ruby
 authors:
 - Tim Adler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -108,6 +108,8 @@ files:
 - lib/capistrano/configs/nginx_app.conf.erb
 - lib/capistrano/configs/nginx_base.conf.erb
 - lib/capistrano/configs/puma.rb.erb
+- lib/capistrano/configs/security_sources_list.erb
+- lib/capistrano/configs/security_upgrades.erb
 - lib/capistrano/configs/unicorn.rb.erb
 - lib/capistrano/configs/upstart.conf.erb
 - lib/capistrano/deploy_mate_capfile.rb