sunzi-rails 0.2.15 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7352a278de207b6cb7fc6f7f6036737098a38778
-  data.tar.gz: f389f62f048975d04d7f76cd4840304eae8201fd
+  metadata.gz: cd0647135cab2984456b5b16552e119fcac36910
+  data.tar.gz: 5d75cef20a7a01c113d1d3dfa87e72b3e9f538e4
 SHA512:
-  metadata.gz: ed4626cbfd6f70ac9fb06639a06b2be7707c37a73123a8f98405e3401e2789bf412c9fa55f665cd71fb1b5cb6faef7a2cdeaa93e0864a38c8937a47db4619b16
-  data.tar.gz: c22f84f8597fe50e63d2417928ced30de234342a6c3a6cdaf75f54b82ba4cf0d582733be54aed5560e8b9413c7ccbc9a06e1e887f6c67d273003b5d1037887e6
+  metadata.gz: dae65e6a0d65e9788c53bc3ae5213922ec1e83f05ca91d9c49146f4acebe2d3dc91d504fb16c07092c4b19f6af6c0d0666904a810f6f1010d093996c5a175229
+  data.tar.gz: 8c4aa0f48fbfe6934801d88b24bf245df81716985d6aae466769e5ea53ca9fc661ebafee17eed158f06306155bd23e7efe2b848c236a2304fe6996d0b0c6b043

data/README.md

@@ -60,7 +60,7 @@ Finally, add `/compiled` to your `.gitignore` file.
 
 All those settings can be overriden in your `sunzi.yml` file within `attributes`.
 
-Also, contextual attributes are available through `@attributes`:
+Also, deploy.rb, deploy/[stage].rb, database.yml (prefixed with `db_`), secrets.yml and contextual attributes (prefixed with `env_`) are available through `@attributes`:
 
 ```ruby
 @attributes.env_stage

data/lib/sunzi/cli.rb

@@ -103,18 +103,14 @@ module Sunzi
 
         @config = YAML.load(File.read(based("sunzi.yml")))
 
-        @attributes = Database.load_env(@stage)
-          .merge(cap.slice(:ruby_version, :deployer_name))
-          .merge(Secrets.load_env(@stage).slice(:deployer_password, :deployer_public_key))
-          .merge(
-            env_stage: @stage,
-            env_role: @role,
-            env_sudo: options.sudo?,
-            env_user: @user,
-            env_host: @host,
-            env_port: @port
-          )
-          .merge(@config['attributes'] || {})
+        @attributes = cap.merge(Database.load_env(@stage)).merge(Secrets.load_env(@stage)).merge(
+          env_stage: @stage,
+          env_role: @role,
+          env_sudo: options.sudo?,
+          env_user: @user,
+          env_host: @host,
+          env_port: @port
+        ).merge(@config['attributes'] || {})
       end
 
       def compile_attributes

data/lib/sunzi/version.rb

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

data/lib/templates/create/files/rails_logs

@@ -0,0 +1,9 @@
+<%= @attributes.deploy_to %>/current/log/*.log {
+  weekly
+  missingok
+  rotate 6
+  compress
+  delaycompress
+  notifempty
+  copytruncate
+}

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

@@ -0,0 +1,15 @@
+if sunzi.to_be_done "install analysers"; then
+  echo "deb http://deb.goaccess.io/ $(lsb_release -cs) main" | tee -a /etc/apt/sources.list.d/goaccess.list
+  wget -O - http://deb.goaccess.io/gnugpg.key | apt-key add -
+
+  sunzi.mute "apt-get update"
+
+  sunzi.install "goaccess"
+  sunzi.install "iotop"
+  sunzi.install "sysstat"
+
+  sed -i 's/ENABLED="false"/ENABLED="true"/' /etc/default/sysstat
+  /etc/init.d/sysstat restart
+
+  sunzi.done "install analysers"
+fi

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

@@ -0,0 +1,7 @@
+if sunzi.to_be_done "setup logrotate"; then
+	mv files/rails_logs /etc/logrotate.d/rails_logs
+	chown root:root /etc/logrotate.d/rails_logs
+	chmod 0644 /etc/logrotate.d/rails_logs
+
+  sunzi.done "setup logrotate"
+fi

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

@@ -13,7 +13,8 @@ source recipes/mysql.sh
 <% end -%>
 source recipes/passenger.sh
 source recipes/user.sh
-source recipes/sysstat.sh
+source recipes/analysers.sh
+source recipes/logrotate.sh
 
 sunzi.elapsed_time $start
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunzi-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.16
 platform: ruby
 authors:
 - Kenn Ejima
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -124,9 +124,12 @@ files:
 - lib/sunzi/utility.rb
 - lib/sunzi/version.rb
 - lib/templates/create/files/authorized_keys
+- lib/templates/create/files/rails_logs
 - lib/templates/create/files/sudoers
 - lib/templates/create/install.sh
+- lib/templates/create/recipes/analysers.sh
 - lib/templates/create/recipes/libraries.sh
+- lib/templates/create/recipes/logrotate.sh
 - lib/templates/create/recipes/mysql.sh
 - lib/templates/create/recipes/nodejs.sh
 - lib/templates/create/recipes/passenger.sh
@@ -134,7 +137,6 @@ files:
 - lib/templates/create/recipes/ruby.sh
 - lib/templates/create/recipes/setup.sh
 - lib/templates/create/recipes/sunzi.sh
-- lib/templates/create/recipes/sysstat.sh
 - lib/templates/create/recipes/update.sh
 - lib/templates/create/recipes/user.sh
 - lib/templates/create/roles/admin.sh
@@ -167,3 +169,4 @@ signing_key:
 specification_version: 4
 summary: Server provisioning utility for minimalists
 test_files: []
+has_rdoc: 

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

@@ -1,9 +0,0 @@
-if sunzi.to_be_done "install sysstat"; then
-  sunzi.install "sysstat"
-  sunzi.install "iotop"
-
-  sed -i 's/ENABLED="false"/ENABLED="true"/' /etc/default/sysstat
-  /etc/init.d/sysstat restart
-
-  sunzi.done "install sysstat"
-fi