ssh: gitlab-user für docker + housekeeping

group_vars/all.yml

@@ -47,9 +47,9 @@
   ### ryandaniels.create_users
   users:
     - username: mg
-      password: "{{ lookup('keepass', 'linux_mg_user_password_hash', 'password') }}"
+      password: "{{ lookup('keepass', 'mg_linux_password_hash', 'password') }}"
       update_password: on_create
-      ssh_key: "{{ lookup('keepass', 'ssh_pubkey_mg', 'password') }}"
+      ssh_key: "{{ lookup('keepass', 'mg_ssh_pubkey', 'password') }}"  #generieren: ssh-keygen -o; für putty  andern https://www.oracle.com/webfolder/technetwork/tutorials/obe/cloud/ggcs/Change_private_key_format_for_Putty/Change_private_key_format_for_Putty.html#section2
       use_sudo: yes
       use_sudo_nopass: yes
       user_state: present

group_vars/docker.yml

@@ -18,9 +18,20 @@
   ### ryandaniels.create_users
   users:
   - username: mg
-    password: "{{ lookup('keepass', 'linux_mg_user_password_hash', 'password') }}"
+    password: "{{ lookup('keepass', 'mg_linux_password_hash', 'password') }}"
     update_password: on_create
-    ssh_key: "{{ lookup('keepass', 'ssh_pubkey_mg', 'password') }}"
+    ssh_key: "{{ lookup('keepass', 'mg_ssh_pubkey', 'password') }}"
+    use_sudo: yes
+    use_sudo_nopass: yes
+    user_state: present
+    groups: ssh, sudo, docker
+    servers:
+      - production
+      - test
+  - username: gitlab-user
+    password: "{{ lookup('keepass', 'gitlab_user_linux_password_hash', 'password') }}"
+    update_password: on_create
+    ssh_key: "{{ lookup('keepass', 'gitlab_user_ssh_pubkey', 'password') }}"
     use_sudo: yes
     use_sudo_nopass: yes
     user_state: present

playbooks/base/1_bootstrap.yml

@@ -28,6 +28,6 @@
         user:
           name: mg
           update_password: always
-          password: "{{ lookup('keepass', 'linux_mg_user_password_hash', 'password') }}"
+          password: "{{ lookup('keepass', 'mg_linux_password_hash', 'password') }}"
 
 # Nach dem ersten durchlaufen ist keine Anmeldung mehr per Passwort & ssh möglich. Damit scheitert auch der Versuch das Playbook ein zweites mal durchlaufen zu lassen.

playbooks/on-off/set_password_mg.yml

@@ -6,7 +6,7 @@
       user:
         name: mg
         update_password: always
-        password: "{{ lookup('keepass', 'linux_mg_user_password_hash', 'password') }}" #hier muss der hash rein
+        password: "{{ lookup('keepass', 'mg_linux_password_hash', 'password') }}" #hier muss der hash rein
 
 # Hash erstellen
 # python -c 'import crypt,getpass; print(getpass.getpass("Name: ")+":"+crypt.crypt(getpass.getpass(),crypt.mksalt(crypt.METHOD_SHA512)))'