sunzi-rails 0.2.19 → 0.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65ee38f56a76325550172fc49431c3bbc94daff4
-  data.tar.gz: f8177aa496160c60851ca3a23dac9e8de1310537
+  metadata.gz: '03049a27d05453db457ad4c76ff6017e5ff1f044'
+  data.tar.gz: bd53f7cb8e0f7326a16123c26bf7ed6de8873281
 SHA512:
-  metadata.gz: b0257265275dde522abb3df056dba5e4f44e78d68693778152e24aa8d907f40fe615a89c8eac5b29f5dd8b649c8c11a3ab0e1990f7ce20547e51d16c2c54010e
-  data.tar.gz: 78d51404c3337eb44b6939112c0b0e0188aa295145914932dbcf0f043adcab7af04a4d6d83bf96a4573eae5420b21a677098978c59ba347e9aba44b91ffc4905
+  metadata.gz: bc351baace7b14c6caf42bb0691a7e450d354906527209c3dac1a209ec33456e17ee0202bafa18d63432e8f1a65ed2e679604e78ba69d92ecade1978cda8dcdf
+  data.tar.gz: e25eefa4bcaebfa46265dd7ed5bf8ddc5912ccf0da2d4c21c9e96228a821048f810383751bc118c119800979dcdc2d113e87be7ead04fd06d029dc3ce530e584

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.4.0

data/README.md

@@ -37,7 +37,7 @@ Go into your `config/deploy.rb` and make sure to have these set:
 
 ```ruby
 set :ruby_version, IO.read("#{File.dirname(__FILE__)}/../.ruby-version").strip
-set :admin_name, 'admin'
+set :admin_name, 'deployer'
 set :deployer_name, 'deployer'
 ```
 
@@ -76,8 +76,7 @@ It's important to note that `deploy.rb` and `deploy/[stage].rb` are loaded in th
 Go into the project directory, then run `sunzi-cap deploy`:
 
 ```bash
-$ sunzi-cap deploy staging admin --sudo
-$ sunzi-cap deploy staging deployer
+$ sunzi-cap deploy staging deployer --sudo
 ```
 
 Now, what it actually does is:

data/lib/sunzi/version.rb

@@ -1,5 +1,5 @@
 module Sunzi
-  VERSION = "0.2.19"
+  VERSION = "0.2.20"
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  RAILS_VERSION = "4.2"
+  RAILS_VERSION = "4.2.6"
 end

data/lib/templates/create/recipes/analysers.sh

@@ -4,13 +4,15 @@ if sunzi.to_be_done "install analysers"; then
 
   sunzi.mute "apt-get update"
 
-  sunzi.install "goaccess" #TODO: http://goaccess.io/faq#howto-config
+  sunzi.install "goaccess"
   sunzi.install "iotop"
   sunzi.install "iftop"
   sunzi.install "ifstat"
   sunzi.install "nethogs"
   sunzi.install "sysstat"
 
+  pip install ngxtop
+
   sed -i 's/#time-format %H:%M:%S/time-format %H:%M:%S/' /etc/goaccess.conf
   sed -i 's|#date-format %d/%b/%Y|date-format %d/%b/%Y|' /etc/goaccess.conf
   sed -i 's/#log-format %h %\^\[%d:%t %\^\] "%r" %s %b "%R" "%u"/log-format %h - %\^ \[%d:%t %\^\] "%r" %s %b "%R" "%u" %T %\^/' /etc/goaccess.conf

data/lib/templates/create/recipes/libraries.sh

@@ -17,6 +17,7 @@ if sunzi.to_be_done "install librairies"; then
   sunzi.install "libxslt1-dev"
   sunzi.install "libcurl4-openssl-dev"
   sunzi.install "python-software-properties"
+  sunzi.install "python-pip"
   sunzi.install "libffi-dev"
   sunzi.install "imagemagick"
 

data/lib/templates/create/recipes/monit.sh

@@ -0,0 +1,10 @@
+if sunzi.to_be_done "install monit"; then
+  sunzi.install "monit"
+
+	chown root:root /etc/monit/monitrc
+	chmod 0700 /etc/monit/monitrc
+
+  /etc/init.d/monit start
+
+  sunzi.done "install monit"
+fi

data/lib/templates/create/recipes/passenger.sh

@@ -6,11 +6,13 @@ if sunzi.to_be_done "install passenger"; then
   sunzi.mute "apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 561F9B9CAC40B2F7"
   sunzi.install "apt-transport-https"
   sunzi.install "ca-certificates"
-  sh -c 'echo deb https://oss-binaries.phusionpassenger.com/apt/passenger trusty main > /etc/apt/sources.list.d/passenger.list'
+
+  sudo sh -c 'echo deb https://oss-binaries.phusionpassenger.com/apt/passenger xenial main > /etc/apt/sources.list.d/passenger.list'
   sunzi.mute "apt-get update"
 
-  sunzi.install "nginx-extras"
-  sunzi.install "passenger"
+  # Install Passenger + Nginx
+  sunzi.install "nginx-extras passenger"
+  sunzi.sudo_mute "service nginx start"
 
   sed -i -e "s|# passenger_root|passenger_root|g" /etc/nginx/nginx.conf
   sed -i -e "s|# passenger_ruby /usr/bin/passenger_free_ruby|passenger_ruby $RBENV_PATH/shims/ruby|g" /etc/nginx/nginx.conf

data/lib/templates/create/recipes/postgres.sh

@@ -7,7 +7,7 @@ if sunzi.to_be_done "install postgres"; then
   sunzi.install "postgresql-contrib"
   sunzi.install "libpq-dev"
 
-  sudo -u postgres psql -c "create user $DB_USER with password '$DB_PWD';"
+#  sudo -u postgres psql -c "create user $DB_USER with password '$DB_PWD';"
   sudo -u postgres psql -c "create database $DB_NAME owner $DB_USER;"
 
   sunzi.done "install postgres"

data/lib/templates/create/recipes/ruby.sh

@@ -6,23 +6,43 @@ PROFILE=$DEPLOYER_PATH/.bashrc
 RUBY_VERSION=<%= @attributes.ruby_version %>
 RBENV_EXPORT_PATH="export PATH=\"$RBENV_PATH/bin:$PLUGINS_PATH/ruby-build/bin:$PATH\""
 RBENV_INIT='eval "$(rbenv init -)"'
+RUBY_VERSION_PATH="$RBENV_PATH/versions/$RUBY_VERSION"
 
 if sunzi.to_be_done "install ruby"; then
-  git clone git://github.com/sstephenson/rbenv.git $RBENV_PATH
-  git clone git://github.com/sstephenson/ruby-build.git $PLUGINS_PATH/ruby-build
-  git clone git://github.com/sstephenson/rbenv-gem-rehash.git $PLUGINS_PATH/rbenv-gem-rehash
-  git clone git://github.com/dcarley/rbenv-sudo.git $PLUGINS_PATH/rbenv-sudo
+
+  if ! [ -d "$RBENV_PATH" ]
+  then
+    git clone git://github.com/sstephenson/rbenv.git $RBENV_PATH
+    git clone git://github.com/sstephenson/ruby-build.git $PLUGINS_PATH/ruby-build
+    git clone git://github.com/sstephenson/rbenv-gem-rehash.git $PLUGINS_PATH/rbenv-gem-rehash
+    git clone git://github.com/dcarley/rbenv-sudo.git $PLUGINS_PATH/rbenv-sudo
+  fi
+
+  # Change user and group to deployer to allow gem installs
+  chown -R deployer:deployer $DEPLOYER_PATH/.rbenv
 
   eval $RBENV_EXPORT_PATH
   eval $RBENV_INIT
   echo $RBENV_EXPORT_PATH >> $PROFILE
   echo $RBENV_INIT >> $PROFILE
 
-  rbenv install $RUBY_VERSION
+  if [ -d "$RUBY_VERSION_PATH" ]
+  then
+    echo 'deleting existing ruby version $RUBY_VERSION_PATH'
+    rm -R $RUBY_VERSION_PATH
+  fi
+
+  echo 'installing ruby version $RUBY_VERSION'
+  rbenv install -v $RUBY_VERSION
+
+  echo 'setting global for ruby version $RUBY_VERSION'
   rbenv global $RUBY_VERSION
+
+  echo 'setting doc for deployer'
   echo 'gem: --no-ri --no-rdoc' > $DEPLOYER_PATH/.gemrc
+
+  echo 'install bundler'
   gem install bundler
-  gem install backup
 
   sunzi.done "install ruby"
 fi

data/lib/templates/create/roles/deployer.sh

@@ -2,6 +2,21 @@ sunzi.setup_progress
 
 start=$(sunzi.start_time)
 
+source recipes/setup.sh
+source recipes/libraries.sh
 source recipes/ruby.sh
+source recipes/nodejs.sh
+<% case @attributes.db_adapter -%>
+<% when 'postgresql' -%>
+source recipes/postgres.sh
+<% when 'mysql', 'mysql2' -%>
+source recipes/mysql.sh
+<% end -%>
+source recipes/passenger.sh
+source recipes/logrotate.sh
+source recipes/noatime.sh
+source recipes/monit.sh
 
 sunzi.elapsed_time $start
+
+# reboot

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunzi-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.2.20
 platform: ruby
 authors:
 - Kenn Ejima
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,20 +17,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 4.2.6
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 4.2.6
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.6.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -130,6 +130,7 @@ files:
 - lib/templates/create/recipes/analysers.sh
 - lib/templates/create/recipes/libraries.sh
 - lib/templates/create/recipes/logrotate.sh
+- lib/templates/create/recipes/monit.sh
 - lib/templates/create/recipes/mysql.sh
 - lib/templates/create/recipes/noatime.sh
 - lib/templates/create/recipes/nodejs.sh
@@ -139,8 +140,6 @@ files:
 - lib/templates/create/recipes/setup.sh
 - lib/templates/create/recipes/sunzi.sh
 - lib/templates/create/recipes/update.sh
-- lib/templates/create/recipes/user.sh
-- lib/templates/create/roles/admin.sh
 - lib/templates/create/roles/deployer.sh
 - lib/templates/create/roles/updater.sh
 - lib/templates/create/sunzi.yml
@@ -157,7 +156,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.3
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -165,9 +164,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Server provisioning utility for minimalists
 test_files: []
-has_rdoc: 

data/lib/templates/create/recipes/user.sh

@@ -1,23 +0,0 @@
-DEPLOYER_NAME=<%= @attributes.deployer_name %>
-DEPLOYER_PWD=<%= @attributes.deployer_password %>
-DEPLOYER_PATH=/home/$DEPLOYER_NAME
-
-if sunzi.to_be_done "create deployer"; then
-  adduser $DEPLOYER_NAME --gecos "First Last,RoomNumber,WorkPhone,HomePhone" --disabled-password
-  echo "$DEPLOYER_NAME:$DEPLOYER_PWD" | sudo chpasswd
-  adduser $DEPLOYER_NAME sudo
-
-  mkdir $DEPLOYER_PATH/.ssh
-  chmod 700 $DEPLOYER_PATH/.ssh
-
-  mv files/authorized_keys $DEPLOYER_PATH/.ssh/authorized_keys
-  chmod 644 $DEPLOYER_PATH/.ssh/authorized_keys
-
-  chown -R $DEPLOYER_NAME:$DEPLOYER_NAME $DEPLOYER_PATH
-
-	mv files/sudoers /etc/sudoers.d/$DEPLOYER_NAME
-	chown root:root /etc/sudoers.d/$DEPLOYER_NAME
-	chmod 0440 /etc/sudoers.d/$DEPLOYER_NAME
-
-  sunzi.done "create deployer"
-fi

data/lib/templates/create/roles/admin.sh

@@ -1,22 +0,0 @@
-sunzi.setup_progress
-
-start=$(sunzi.start_time)
-
-source recipes/setup.sh
-source recipes/libraries.sh
-source recipes/nodejs.sh
-<% case @attributes.db_adapter -%>
-<% when 'postgresql' -%>
-source recipes/postgres.sh
-<% when 'mysql', 'mysql2' -%>
-source recipes/mysql.sh
-<% end -%>
-source recipes/passenger.sh
-source recipes/user.sh
-source recipes/analysers.sh
-source recipes/logrotate.sh
-source recipes/noatime.sh
-
-sunzi.elapsed_time $start
-
-reboot