Add ssl_certs_enabled variable and use it to avoid ssl certs when running on vagrant

Remove state: latest
Naming changes
2022-11-15 23:05:52 +01:00 · 2022-11-14 18:04:01 +01:00 · 2022-11-14 17:50:19 +01:00 · 2022-11-14 00:13:24 +01:00 · 2022-11-13 22:39:14 +01:00 · 2022-11-13 22:04:37 +01:00
2 changed files with 17 additions and 13 deletions
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@ -4,14 +4,14 @@ users:
    comment: Jesper Hess Nielsen
    password: '!'
    groups: []
-    ssh_keys: []
+    keys: []

  - name: valberg
    comment: Vidir Valberg Gudmundsson
    password: $6$qt3G.E.CxhC$OwBDn4rZUbCz06HLEMBHjgvKjxiv/eeerbklTHi.gpHIn1OejzX3k2.0NM0Dforaw6Yn5Y8Cgn8kL2FdbQLZ3/
    groups:
      - sudo
-    ssh_keys:
+    keys:
      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDUmGeHc6QXDcJHkmVxbTUv04Q3vs20avquoGr6eOkkvYbcgjuFnBOOtvs2Nul1odcvvnHa1nN7DfL8XJamiwsB1B/xe2seaNS1axgwk9XowlVN9pgga8gsC+4gZWBtSObG2GR8n4NtPENzPmW5deNn8dRpTvULPMxZ0VRE9yNQOx8v8w85yYh+vxbbkWGVDYJU23yuJI50U9y6bXxNHinsACDFBeR/giXDlw29TaOaSxz0R6zrRPBoX+V68RyWwBL+KWQKtX2ULtJI40S98Ohd6p41bIxYHCBS/zroqNne8PjYOLcHHsjHUGfTvhcS5a3zdz/iHsvsaOOjFjsydAXH valberg

  - name: reynir
@ -19,7 +19,7 @@ users:
    password: $6$MiPv.ZFlWnLHGNOb$jdQD9NaPMRUGaP2YHRJNwrMPBGl9qwK0HFhI6x51Xpn7hdzuC4GIwvOw1DJK33sNs/gGP5bWB0izviXkDcq7B0
    groups:
      - sudo
-    ssh_keys:
+    keys:
      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDJl8/rikIUnqr9fPF3rE0rjWHCNzte10LvkjGmpdO9ka/NubQ7O25fp08rC+n0d1pUooYwHBAgiv9Hsql6HF9QfNKNUp7IKp7CXWcjb4ga02kuzWGSXjm40Vf0jSadIrJ33M4SeJHTByDGoeYPQBQ7n+qHdwcqJADBQygBuc5sRzxm8i0sbmzF3DJDDVeTJjEY5pfR4vnJlpmU8SC2d1ZkhCjmKCsL0PShntTIt1ztCt0yO71KoHKaNPu1jutGxcU9u7J1pEqcPT6EzU/cQJ4DMVzrGp26nIV0msRl3NeGNjukwXOzAh6KmsmXG7yWFyQmLRqgc/bjUeyhuWJ10vwUbaYVeIef7YrgEOgnkYLIFeWRMhdnwtL/W8g1D66SFx7+iYJj180eTi8Lc8rZm2NaiGynvWlFcJ4PGdTYZsWcFzQ+SaDziNMw1H3IixxdlD8Shw9mxpijJ+A4dH2kkUXyGVsc13zRIU7hq9ax8nrw6HVLGFLn09rEPig+SkyWrqRpRGMBWyqTRJywIV6jk0ll+i8rJZA2McY0rABbACrzXT5VBj5dLKnnRITLDicAYgt7YuEiQ0ffErQrPXXHUVeI0QKnJgplSHxH5QsX9a1Y+NoaoditdMT2bjvEqROi+/JYRycLR/BQV/d2nFPhqwq1x1AFvL4f8UvVH/hxp3PXWw== reynir yubikey
      - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPR8t/wNRp7Dt3wr9uZKVTofTDVYrcoQNru5ETxL+37t reynir@spurv

@ -28,5 +28,7 @@ users:
    password: $6$18dN367fG162hQ9A$Aqkf3O24Ve1btzh1PPOPg3uyydv/AQYUxethcoB4klotebJq3/XsydYT7XBuarxfDccVwyPTMlsP3U8VfQpG60
    groups:
      - sudo
-    ssh_keys:
+    keys:
      - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPd/4fQV7CL8/KVwbo/phiV5UdXFBIDlkZ+ps8C7FeRf samsapti
+
+volume_root_folder: "/docker-volumes"
--- a/roles/ubuntu_base/tasks/users.yml
+++ b/roles/ubuntu_base/tasks/users.yml
@ -4,20 +4,22 @@
    name: "{{ item.name }}"
    comment: "{{ item.comment }}"
    password: "{{ item.password }}"
-    groups: "{{ item.groups }}"
-    update_password: "always"
+    update_password: "on_create"
+    groups:  "{{ item.groups }}"
  loop: "{{ users | default([]) }}"

 - name: "Add ssh authorized_keys"
  authorized_key:
-    user: "{{ item.name }}"
-    key: "{{ item.ssh_keys | join('\n') }}"
-    exclusive: true
-  loop: "{{ users | default([]) }}"
+    user: "{{ item.0.name }}"
+    key: "{{ item.1 }}"
+  with_subelements:
+  - "{{ users | default([]) }}"
+  - keys

 - name: "Add ssh authorized_keys to root user"
  authorized_key:
    user: "root"
-    key: "{{ item.ssh_keys | join('\n') }}"
-    exclusive: true
-  loop: "{{ users | default([]) }}"
+    key: "{{ item.1 }}"
+  with_subelements:
+  - "{{ users | default([]) }}"
+  - keys
Author	SHA1	Message	Date
Víðir Valberg Guðmundsson	5d0c913c2a	Add ssl_certs_enabled variable and use it to avoid ssl certs when running on vagrant	2022-11-15 23:05:52 +01:00
Sam A.	42ebebc3f5	Remove state: latest	2022-11-14 18:04:01 +01:00
Sam A.	79ec0627d4	Naming changes	2022-11-14 17:50:19 +01:00
Sam A.	3b7c096f8e	Simplify config and rename some files	2022-11-14 00:13:24 +01:00
Sam A.	01d9d3c04b	Don't use local config for Docker registry login It doesn't work when deploying in Vagrant :(	2022-11-13 22:39:14 +01:00
Sam A.	41f09e7b33	Vagrant: Use same Ubuntu version as in production	2022-11-13 22:04:37 +01:00
Sam A.	d0904a96a8	Fix SSH port logic again	2022-11-13 22:03:45 +01:00
Sam A.	581c832b36	Some Vagrant fixes Only install Dell OpenManage if not running in a VM, and fix SSH port logic.	2022-11-13 21:42:52 +01:00
Sam A.	6a16328b7b	Make Ansible setup testable in Vagrant Added logic to change the sshd port if not already configured, configued Vagrantfile to work properly and fixed a couple of deploy errors.	2022-11-13 20:26:58 +01:00