2 files changed, 11 insertions(+), 43 deletions(-)

M .drone.yml
M ansible/environments/unstable.yml

@@ 89,42 89,10 @@ steps:
     environment:
       VAULT_PWD:
         from_secret: vault_password
+      MINIO_BASE:
+        from_secret: s3_host
+      MINIO_BUCKET:
+        from_secret: s3_bucket
     commands:
       - echo "${VAULT_PWD}" > vault_password.txt
-      - ansible-playbook ansible/deploy.yml -i ansible/environments/unstable.yml --vault-password-file vault_password.txt
----
-kind: pipeline
-type: docker
-name: deploy-beta
-trigger:
-  event:
-    - promote
-  target:
-    - beta
-steps:
-  - name: deploy
-    image: danihodovic/ansible
-    environment:
-      VAULT_PWD:
-        from_secret: vault_password
-    commands:
-      - echo "${VAULT_PWD}" > vault_password.txt
-      - ansible-playbook ansible/deploy.yml -i ansible/environments/beta.yml --vault-password-file vault_password.txt
----
-kind: pipeline
-type: docker
-name: deploy-stable
-trigger:
-  event:
-    - promote
-  target:
-    - unstable
-steps:
-  - name: deploy
-    image: danihodovic/ansible
-    environment:
-      VAULT_PWD:
-        from_secret: vault_password
-    commands:
-      - echo "${VAULT_PWD}" > vault_password.txt
-      - ansible-playbook ansible/deploy.yml -i ansible/environments/stable.yml --vault-password-file vault_password.txt>
\ No newline at end of file
+      - ansible-playbook ansible/deploy.yml -i ansible/environments/unstable.yml --vault-password-file vault_password.txt -e "server_binary_url=${MINIO_BASE}/${MINIO_BUCKET}/builds/${DRONE_COMMIT_SHA}/starkingdoms-server/target/release/starkingdoms-server client_package_url=${MINIO_BASE}/${MINIO_BUCKET}/builds/${DRONE_COMMIT_SHA}/client.tar.xz/starkingdoms-client/dist/client.tar.xz"<
\ No newline at end of file

@@ 4,11 4,11 @@ gameservers:
       ansible_port: 20452
       ansible_password: !vault |
         $ANSIBLE_VAULT;1.1;AES256
-        62613139386531666161396438613834363735633531663738663262346162303031613763346637
-        3663313932393738303766376239383933306637336566330a663061303263316134346434323830
-        66633239613039646431303634303965316531333063323537373039316635316238343539653137
-        6463653339343439650a373138333165393838626437366466636134326664653832356631646436
-        63373364303430633031643237303235346463626233346664353531383063663430383964306266
-        6631393765336366316239326466396563386565646334376438
+        30633533383938356363613936373132616565383938343732346462633263383237356364656139
+        6564373961356564623930363538616539326562343733390a616564636332373666386531313033
+        65623837366639393462333830616562366136343630393833393966663062343438326333393565
+        3961663664623962310a663265313036663835636638636561303363373962303139396235633631
+        32646362336332356630633138613765616563653164316134306463316466326266623863343631
+        3134616435636662666637623638383736343064626564616135
   vars:
     ansible_user: stk=
\ No newline at end of file