Improving scripts

Author: renato2099

devops/capistrano/config/deploy.rb

@@ -2,7 +2,7 @@
 lock "~> 3.17.1"
 
 set :application, "tagbase-server"
-set :repo_url, "[email protected]:tagbase/tagbase-server.git"
+set :repo_url, "https://github.com/tagbase/tagbase-server.git" # [email protected]:tagbase/tagbase-server.git"
 
 # Default branch is :master
 # ask :branch, `git rev-parse --abbrev-ref HEAD`.chomp

devops/capistrano/config/deploy/staging.rb

@@ -1,12 +1,14 @@
 set :branch, "149_configuration_tool"
+set :server_ip, "3.145.103.174"
 
 # server-based syntax
 # ======================
 # Defines a single server with a list of roles and multiple properties.
 # You can define all roles on a single server, or split them:
 
 # server "example.com", user: "deploy", roles: %w{app db web}, my_property: :my_value
-server "18.117.121.155", user: "ubuntu", roles: %w{app}
+#server "3.145.103.174", user: "ubuntu", roles: %w{app}
+server fetch(:server_ip), user: "ubuntu", roles: %w{app}
 # server "example.com", user: "deploy", roles: %w{app web}, other_property: :other_value
 # server "db.example.com", user: "deploy", roles: %w{db}
 
@@ -20,7 +22,8 @@
 # property set. Specify the username and a domain or IP for the server.
 # Don't use `:all`, it's a meta role.
 
-role :app, %w{[email protected]}
+#role :app, %w{[email protected]}
+role :app, "ubuntu@#{fetch(:server_ip)}"
 # role :web, %w{[email protected] [email protected]}, other_property: :other_value
 # role :db,  %w{[email protected]}
 

devops/inventory

@@ -3,9 +3,9 @@ tagbase_server_devserver docker_service_name=tagbase_server_devserver
 
 #[prod_server]
 #one.example.com
-#
+
 [dev_servers]
-18.117.121.155
+3.145.103.174
 
 #one.example.com
 

devops/tagserver_playbook.yaml

@@ -37,21 +37,26 @@
         state: latest
         update_cache: true
 
-    - name: Install git
+    - name: Install git - curl - ssh client
       apt:
         name: "{{ item }}"
         state: installed
         state: "{{ item.state | default('present') }}"
       with_items:
         - git
         - curl
-        #- systemctl
+        - openssh-client
+        - net-tools
+        - postgresql-client
     - name: Install docker-compose
       command: sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64" -o /usr/local/bin/docker-compose
     - name: Create symbolic link for docker-compose
       command: sudo ln -sf /usr/local/bin/docker-compose /usr/bin/docker-compose
     - name: Setting permissions right for docker-compose
       command: sudo chmod +x /usr/local/bin/docker-compose
+        #- name: Set ssh-agent properties
+        #command: eval `ssh-agent -s`; #sudo ssh-add -D;
+        # sudo ssh-agent; sudo ssh-add;
     - name: Create dir for project
       command: mkdir -p /home/ubuntu/tagbase-server/
     - name: Change ownership
@@ -65,6 +70,7 @@
         #- name: Checkout specific tagserver branch
         #  command: chdir=/root/tagbase-server git checkout -b 149_configuration_tool origin/149_configuration_tool
     - name: Setting up tagbase-server env file
+      become: false
       copy:
         content: |
                  [email protected]
@@ -73,7 +79,7 @@
                  POSTGRES_PORT=5432
                  SLACK_BOT_CHANNEL=tagbase-server
                  SLACK_BOT_TOKEN=XYZXYZ
-        dest: /home/ubuntu/.env
+        dest: /home/ubuntu/tagbase-server/.env
           #- name: Build Tagbase services
           #  command: chdir=/root/tagbase-server docker-compose build
           #- name: Deploy Tagbase services