clean up secrets a bit. oops

Diesel-Net · Jul 14, 2023 · c161751 · c161751
1 parent 879cbc7
commit c161751
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/.ansible/group_vars/all/dockerhub.yaml b/.ansible/group_vars/all/dockerhub.yaml
@@ -1,16 +1,2 @@
-dockerhub_username: !vault |
-  $ANSIBLE_VAULT;1.1;AES256
-  61343931653064343262373039383165386135303532333132336131303439316230396536313564
-  3230313537303633326465393436316161613830346331390a306264346462356165376136663930
-  30393661636338376631623537336537623035376336633635353561643033303462346461353461
-  6635663734373038640a616566636338613863363065336435653862396439633030653437623633
-  3263
-  
-dockerhub_password: !vault |
-  $ANSIBLE_VAULT;1.1;AES256
-  62343130333463643237633263643335366561623466643036346234346337366233356166633538
-  3831316665336164626361303062643433373931663133310a356664623262353638666266663934
-  62396632306565393435343338353030653930376362346666616135303764323766656134633031
-  3436663938363265300a303136366230373332323831306465303263353131623765356533333232
-  65386462636437376538636363336432613834616165376137393064303764653239393339643862
-  6236613761656161393063393633303338613934323061316239
+dockerhub_username: '{{ lookup("env", "DOCKERHUB_USERNAME") }}'
+dockerhub_username: '{{ lookup("env", "DOCKERHUB_PASSWORD") }}'
diff --git a/.drone.yaml b/.drone.yaml
@@ -8,6 +8,10 @@ steps:
     image: docker.nexus.diesel.net/drone-ansible:2.13
     environment:
       ANSIBLE_CONFIG: .ansible/ansible.cfg
+      DOCKERHUB_USERNAME:
+        from_secret: dockerhub_username
+      DOCKERHUB_PASSWORD:
+        from_secret: dockerhub_password
     settings:
       playbook: .ansible/deploy.yaml
       galaxy: .ansible/roles/requirements.yaml
@@ -23,6 +27,10 @@ steps:
     image: docker.nexus.diesel.net/drone-ansible:2.13
     environment:
       ANSIBLE_CONFIG: .ansible/ansible.cfg
+      DOCKERHUB_USERNAME:
+        from_secret: dockerhub_username
+      DOCKERHUB_PASSWORD:
+        from_secret: dockerhub_password
     settings:
       playbook: .ansible/deploy.yaml
       galaxy: .ansible/roles/requirements.yaml
@@ -48,8 +56,10 @@ steps:
     image: docker.nexus.diesel.net/drone-ansible:2.13
     environment:
       ANSIBLE_CONFIG: .ansible/ansible.cfg
-      LDAP_ADMIN_PASSWORD:
-        from_secret: ldap_admin_password
+      DOCKERHUB_USERNAME:
+        from_secret: dockerhub_username
+      DOCKERHUB_PASSWORD:
+        from_secret: dockerhub_password
     settings:
       playbook: .ansible/deploy.yaml
       galaxy: .ansible/roles/requirements.yaml