capun 0.0.36 → 0.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd2d0209333f80b6280c97e337ccdb16654cd33e
-  data.tar.gz: aa455b48e10975729edcb5d22d0d8aad9fab2799
+  metadata.gz: ebbfec60f7485585337c2a0f579ad4e8396369d1
+  data.tar.gz: 6c2a575d5f900e4e5b8388656b319cf86ef610af
 SHA512:
-  metadata.gz: 44d2cbbd65e723b80dd5b33eb257053f0ddd3b109b5c872105e41df7c2f1f242c7047c9a7e7a5d48c8d6e4e817978d3086f1678230c4eb8d618261ff6815a36c
-  data.tar.gz: af28c3f6e18f044505c2cbc0967663adf7623751e797d1451b64d74569d848990dd03af291e544f37da929493630329c785fa7d511f4ad49a5c33624f8399fa3
+  metadata.gz: 856154d06b018eddf28f915c6bca6b44f1c119df653dff7bdb21bf61d90bb9376c19361a0da3e4872ca7e36d633347d5b378618179095c8349196c8669e8e765
+  data.tar.gz: edd8082e3d23a84ad81dec22c176da30eea2a08b8561cc414490039e9eb7809e8334609642b5e65df93f8f856b0e32c7c93db5c5a14927da301c43aec0a2b4b4

data/lib/capun/version.rb

@@ -1,3 +1,3 @@
 module Capun
-  VERSION = "0.0.36"
+  VERSION = "0.0.37"
 end

data/lib/generators/capun/templates/backup.sh.erb

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+has_error=0
+error_text="";
+
 cd /home/<%= fetch(:user) %>/apps/<%= fetch(:application) %>/shared
 curdate=$(date +"%m-%d-%y")
 mkdir -p "backuping/version-$curdate"
@@ -16,28 +19,70 @@ DATA_BASE_TYPE="<%=fetch(:stage)%>.sql"
 username=$(cat config/database.yml | grep username | sed s/username://g | xargs)
 password=$(cat config/database.yml | grep password | sed s/password://g | xargs)
 database=$(cat config/database.yml | grep database | sed s/database://g | xargs)
+{
 mysqldump --user="$username" --password="$password" $database > "backuping/version-$curdate/<%=fetch(:stage)%>.sql"
+} || {
+  has_error=1
+  error_text="Mysql dump error"
+}
+fi
+
+
+if [ "$adapter" = "postgresql" ]; then
+DATA_BASE_TYPE="<%=fetch(:stage)%>.sql"
+username=$(cat config/database.yml | grep username | sed s/username://g | xargs)
+password=$(cat config/database.yml | grep password | sed s/password://g | xargs)
+database=$(cat config/database.yml | grep database | sed s/database://g | xargs)
+
+if grep "localhost:5432:$database:$username:$password" ~/.pgpass; then 
+   echo "pg config exists"     
+else 
+   echo "localhost:5432:$database:$username:$password" >> ~/.pgpass;  
+   chmod 600 ~/.pgpass
+fi
+
+{
+  pg_dump -h localhost -U $username -d $database -f backuping/version-$curdate/<%=fetch(:stage)%>.sql
+} || {
+  has_error=1
+  error_text="PG dump error"
+}
 fi
 
 COUNTER=5
+
+
 until [  $COUNTER -lt 1 ]; do
-    python drivesink.py upload "backuping" <%= fetch(:backupDestinationFolder) || "backups/firstdedic-server/" + fetch(:application)  %> >> log/backup.log 2>&1
+    #{ #try
+    python drivesink.py upload "backuping" <%= fetch(:backupDestinationFolder) || "backups/firstdedic-server/" + fetch(:application)  %> -c /home/kobe/.drivesink #>> log/backup.log 2>&1
+    #} || { 
+    #  has_error=1;
+    #  error_text="Cannot upload files";
+    #}
     if [ $? -eq 0 ]; then
       COUNTER=0
     else
-      COUNTER=$($COUNTER -1)
+      COUNTER=$[$COUNTER -1]
     fi
 done
 
-if [ $? -eq 0 ]; then
+if ([ $? -eq 0 ] && [ "$has_error" == 0 ]); then
 SIZE=$(du -sh backuping | awk '{print $1}')
 curl -X POST -H 'Content-type: application/json' \
 --data "{'attachments': [{'mrkdwn_in': ['text'],'text': 'Успешо создан бэкап для *<%= fetch(:application) %>*\n<% (fetch(:backupFolders) || []).each do |folder|%><%= "- " +folder + '\n' %><% end %>- $DATA_BASE_TYPE\nРазмер *$SIZE*','color': '#3AA3E3', 'title': 'Amazon Backup System'}]<%=", \'channel\': \'#{fetch(:slack_channel)}\' " if !fetch(:slack_channel).nil? %>}" \
 <%= fetch(:slack_hook) %>
+
+#telegram notification
+curl -i -X GET ""https://api.telegram.org/bot<%= fetch(:backup_telegram_bot_hash) %>/sendMessage?chat_id=<%= fetch(:backup_telegram_chat_id) %>&text=✅ Бекап для <%= fetch(:application) %>"
+
 else
 curl -X POST -H 'Content-type: application/json' \
 --data "{'attachments': [{'mrkdwn_in': ['text'],'text': 'Произошла ошибка при создании бэкапа для *<%= fetch(:application) %>','color': '#FF0000', 'title': 'Amazon Backup System'}]<%=", \'channel\': \'#{fetch(:slack_channel)}\' " if !fetch(:slack_channel).nil? %>}" \
 <%= fetch(:slack_hook) %>
+
+#telegram notification
+curl -i -X GET "https://api.telegram.org/bot<%= fetch(:backup_telegram_bot_hash) %>/sendMessage?chat_id=<%= fetch(:backup_telegram_chat_id) %>&text=🚫  Бекап для <%= fetch(:application) %> \[Error: $error_text\]"
+
 fi
 
-rm -rf backuping
+sudo rm -rf backuping

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capun
 version: !ruby/object:Gem::Version
-  version: 0.0.36
+  version: 0.0.37
 platform: ruby
 authors:
 - Ivan Zamylin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2017-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,8 +164,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Opinionated Rails deployment solution with CAPistrano, Unicorn and Nginx.
 test_files: []
+has_rdoc: