...

.drone.yml

@@ -18,15 +18,15 @@ pipeline:
       #- pip install --upgrade pip ansible==2.2.0 markupsafe ecdsa pyOpenSSL;
       - curl -OL https://github.com/digitalocean/doctl/releases/download/v1.8.0/doctl-1.8.0-linux-amd64.tar.gz
       - tar xf doctl-1.8.0-linux-amd64.tar.gz
-      - ./doctl auth init -t 083d19437d43fc51983c8926e5060bdb5039032e7d2a933395b2513573c799d3
-      - ID=$(./doctl compute droplet create test-installer-fd3 --wait --format "ID" --size s-6vcpu-16gb --image debian-9-x64 --region nyc3 --ssh-keys b4:2b:5f:4c:0c:be:6e:77:50:85:96:ca:70:55:db:aa --tag-names test,fd3-test,installer | tail -1)
-      - echo $ID
-      - ./doctl compute droplet get $ID --format "PublicIPv4" --no-header > dd.id
-      - FD3IP=$(cat dd.id)
-      - timeout 30 sh -c 'until nc -z $0 $1; do sleep 1; done' $FD3IP 22
+        #- ./doctl auth init -t 083d19437d43fc51983c8926e5060bdb5039032e7d2a933395b2513573c799d3
+        #- ID=$(./doctl compute droplet create test-installer-fd3 --wait --format "ID" --size s-6vcpu-16gb --image debian-9-x64 --region nyc3 --ssh-keys b4:2b:5f:4c:0c:be:6e:77:50:85:96:ca:70:55:db:aa --tag-names test,fd3-test,installer | tail -1)
+        #- echo $ID
+        #- ./doctl compute droplet get $ID --format "PublicIPv4" --no-header > dd.id
+      - FD3IP=165.227.7.103
+        #- timeout 30 sh -c 'until nc -z $0 $1; do sleep 1; done' $FD3IP 22
 #ssh con IP doctl
-      - chmod 0600 bitbucket.id_rsa
-      - eval $(ssh-agent) ; ssh-add bitbucket.id_rsa
+      - chmod 0600 tools/keys/bitbucket.id_rsa
+      - eval $(ssh-agent) ; ssh-add tools/keys/bitbucket.id_rsa
       - ssh -i bitbucket.id_rsa -o StrictHostKeyChecking=no root@$FD3IP apt-get update
       
       - ssh -i bitbucket.id_rsa -o StrictHostKeyChecking=no root@$FD3IP apt-get install curl git python python-pip -yq
@@ -41,7 +41,9 @@ pipeline:
       - ssh -i bitbucket.id_rsa -o StrictHostKeyChecking=no root@$FD3IP mkdir /opt/flowdat
 
 ####. Descargar el fuente de instalación.   
-      - ssh -A -o StrictHostKeyChecking=no root@$FD3IP git clone git@bitbucket.org:ikflowdat/installer.git /opt/installer
+#- ssh -A -o StrictHostKeyChecking=no root@$FD3IP git clone git@bitbucket.org:ikflowdat/installer.git /opt/installer
+      - ssh -A -o StrictHostKeyChecking=no root@$FD3IP rm -rf /opt/flowdat
+      - scp -r -o StrictHostKeyChecking=no . root@$FD3IP:/opt/installer
 
 ####. Construir el docker que se utilizará durante la instalación.
       - ssh -o StrictHostKeyChecking=no root@$FD3IP 'cd /opt/installer/tools; docker build --build-arg DIR_INSTALL=$(pwd) -t dind .'

tools/playbook.yml

@@ -268,14 +268,6 @@
     - name: "Doctrine schema update"
       shell: "bin/console doctrine:schema:update --force"
 
-- name: "Copy certs dir to extra/nginx/certs"
-  hosts: 127.0.0.1
-  connection: local
-  tags: copy_cert
-  tasks:
-    - name: "Copy certs directory"
-      shell: "cp -nr /opt/flowdat/certs/* /opt/flowdat/extra/nginx/certs"
-
   # Generate self-signed cert files for Nginx (intended for development, please replace with proper ones)
 - name: "Generate self-signed cert files for Nginx"
   hosts: 127.0.0.1
@@ -283,9 +275,19 @@
   tags: self_cert
   tasks:
     - name: "Make sure certs dir exists"
-      shell: "mkdir -p /opt/flowdat/extra/nginx/certs"
+      shell: "mkdir -p /opt/flowdat/certs"
     - name: "Generate self-signed certs for Nginx"
-      shell: "openssl req -x509 -nodes -batch -days 365 -newkey rsa:2048 -keyout /opt/flowdat/extra/nginx/certs/privkey.pem -out /opt/flowdat/extra/nginx/certs/fullchain.pem -subj '/C=AR/ST=Santa Fe/L=Rosario/O=Interlink/OU=R&D/CN=*.{{ lookup('env','CLIENT') }}.{{ lookup('env','DOMAIN') }}/emailAddress=idev@interlink.com.ar'"
+      shell: "openssl req -x509 -nodes -batch -days 365 -newkey rsa:2048 -keyout /opt/flowdat/certs/privkey.pem -out /opt/flowdat/certs/fullchain.pem -subj '/C=AR/ST=Santa Fe/L=Rosario/O=Interlink/OU=R&D/CN=*.{{ lookup('env','CLIENT') }}.{{ lookup('env','DOMAIN') }}/emailAddress=idev@interlink.com.ar'"
+
+- name: "Copy certs dir to extra/nginx/certs"
+  hosts: 127.0.0.1
+  connection: local
+  tags: copy_cert
+  tasks:
+    - name: "Copy certs directory"
+      shell: "cp -nr /opt/flowdat/certs/* /opt/flowdat/extra/nginx/certs"
+
+
 - name: "Run up all. Tag=up_all"
   hosts: 127.0.0.1
   connection: local