deploy_mate 0.12 → 0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df92af3b0b6a83b873bfee7b3b530e587c36c25a
-  data.tar.gz: d22321dbdc778da42189d9675d2bb9d6dc021311
+  metadata.gz: ecff54aca5c2d8f35ce98fbfd84d318298d67e4b
+  data.tar.gz: 1ab1844832d1b169399e08391d1359689e76ce55
 SHA512:
-  metadata.gz: fdd8f006ea0e5438a65cee27a31a142126341476ff7674b1c25f40ba7b0a6da796b3e4db9bf825b9b2a03715d96ff0ccfb0609afe17d7af998f375898669bb80
-  data.tar.gz: 932117d4c5e14a6961569ce72f3e3deaf8cdfe0fe08a902b9d100d72532fb2e13d769eedc4da37968d562c0f0fa10a187c1175d3a56e2f430285f511365275cf
+  metadata.gz: a671312408425d9c58d9493d2b875065dc8ea2b9193e663b6a36750dbc3b6edd682580568e856da694e91f93e7afe822e1f10dbd96a79b1b721a5e493762cf0e
+  data.tar.gz: 739d9c612e3b5285dda0a4b52131efd85d5d559fe1df63dae8ebfd7015b0c36ab47c40306a6dc0c75bda08aee3619e8aa9f6efc063e15b88dbabe109a8008c41

data/README.md

@@ -20,6 +20,7 @@ You can choose Database:
 - Postgres
 
 ## Changelog
+* **2015-06-23**: Support creation of working `ubuntu` user. Error out if another user than `ubuntu` is used.
 * **2015-06-22**: Support for choosing your Ruby-version when creating the `Capfile`. Suggestions come from `.ruby-version` and `Gemfile`.
 * **2015-04-29**: Load custom rake tasks from lib/capistrano/tasks directory.
 You need to run the generator ```rake deploy_mate:install``` again or add ```Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }``` to your Capfile.

data/deploy-mate.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name                      = "deploy_mate"
-  s.version                   = "0.12"
+  s.version                   = "0.13"
 
   s.authors                   = ["Tim Adler"]
-  s.date                      = %q{2015-06-22}
+  s.date                      = %q{2015-06-23}
   s.description               = %q{This is how we deploy around here.}
   s.summary                   = s.description
   s.email                     = %q{tim.adler (at) hanseventures (dot) com}

data/lib/capistrano/deploy_mate_capfile.rb

@@ -23,7 +23,7 @@ require 'capistrano/bundler'
 require "capistrano/helpers.rb"
 
 # Load custom modules with helper functions
-%w(aptitude bluepill upstart).each do |m|
+%w(aptitude bluepill upstart user_management).each do |m|
   load File.expand_path("../modules/#{m}.rb", __FILE__)
 end
 

data/lib/capistrano/modules/user_management.rb

@@ -0,0 +1,11 @@
+module UserManagement
+
+  def whoami
+    capture(:whoami)
+  end
+
+  def am_i?(user_name)
+    whoami == user_name
+  end
+
+end

data/lib/capistrano/scripts/create_ubuntu_user.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+sudo mkdir -p /home/ubuntu/.ssh/
+sudo groupadd ubuntu
+sudo useradd ubuntu -g ubuntu -d /home/ubuntu -s /bin/bash
+sudo adduser ubuntu sudo
+sudo cp ~/.ssh/authorized_keys /home/ubuntu/.ssh/
+sudo chown -R ubuntu:ubuntu /home/ubuntu
+sudo echo "ubuntu ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/ubuntu_no_sudo_password
+sudo chmod 0440 /etc/sudoers.d/ubuntu_no_sudo_password

data/lib/capistrano/scripts/set_defaults.sh

@@ -1,3 +1,4 @@
 #!/bin/bash
 source ~/.rvm/scripts/rvm
-rvm --default $1
+rvm --default $1
+echo "gem: --no-rdoc --no-ri" >> ~/.gemrc

data/lib/capistrano/tasks/machine.rake

@@ -1,5 +1,6 @@
 namespace :machine do
   include Aptitude
+  include UserManagement
 
   desc "Sets up a blank Ubuntu to run our Rails-setup"
   task :init do
@@ -22,6 +23,26 @@ namespace :machine do
       invoke "machine:install:postgres_dev" if fetch(:db_engine) == "postgresql"
     end
   end
+  before "machine:init", "machine:check_ubuntu_user"
+  before "deploy", "machine:check_ubuntu_user"
+
+  desc "Check if we are doing things as the correct user"
+  task :check_ubuntu_user do
+    on roles(:app) do
+      unless am_i?("ubuntu")
+        invoke "machine:create_ubuntu_user"
+        error "Please use a use a user named 'ubuntu' to login to the machine."
+        fail
+      end
+    end
+  end
+
+  desc "Creates an Amazon AWS-style 'ubuntu'-user on machines with only 'root'"
+  task :create_ubuntu_user do
+    on roles(:app) do
+      execute_script("create_ubuntu_user.sh")
+    end
+  end
 
   desc "Install configs"
   task :setup do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deploy_mate
 version: !ruby/object:Gem::Version
-  version: '0.12'
+  version: '0.13'
 platform: ruby
 authors:
 - Tim Adler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -94,6 +94,8 @@ files:
 - lib/capistrano/modules/aptitude.rb
 - lib/capistrano/modules/bluepill.rb
 - lib/capistrano/modules/upstart.rb
+- lib/capistrano/modules/user_management.rb
+- lib/capistrano/scripts/create_ubuntu_user.sh
 - lib/capistrano/scripts/install_ruby.sh
 - lib/capistrano/scripts/install_rvm.sh
 - lib/capistrano/scripts/set_defaults.sh