From ec4796c48e43ff878a67d7eea2a07454e99d4f7c Mon Sep 17 00:00:00 2001
From: fossilfranv <aa@aa.ca>
Date: Fri, 28 Apr 2023 15:44:59 -0700
Subject: [PATCH] Update 'ansible/ubuntu/setup-pb.yml'

---
 ansible/ubuntu/setup-pb.yml | 54 +++++++++++++++----------------------
 1 file changed, 21 insertions(+), 33 deletions(-)

diff --git a/ansible/ubuntu/setup-pb.yml b/ansible/ubuntu/setup-pb.yml
index 57741b6..e957eeb 100644
--- a/ansible/ubuntu/setup-pb.yml
+++ b/ansible/ubuntu/setup-pb.yml
@@ -749,17 +749,17 @@
 #    - name: Download the Rootless Docker installer
 #      get_url:
 #        url: https://get.docker.com/rootless
-#        dest: /home/user_this/dockerRootless.sh
+#        dest: /home/{{ user }}/dockerRootless.sh
 #        mode: 0700
 
 #    - name: Change back ownership to user_this for docker
 #      ansible.builtin.shell:
-#        cmd: chown -R user_this:user_this /home/user_this/dockerRootless.sh
+#        cmd: chown -R {{ user }}:{{ user }} /home/{{ user }}/dockerRootless.sh
 
 #    - name: Install Rootless Docker
-#      shell: /home/user_this/dockerRootless.sh
+#      shell: /home/{{ user }}/dockerRootless.sh
 #      become: yes
-#      become_user: user_this
+#      become_user: "{{ user }}"
 
 #    - name: Start docker
 #      systemd:
@@ -768,31 +768,31 @@
 #        enabled: yes
 #        scope: user
 #      become: yes
-#      become_user: user_this
+#      become_user: "{{ user }}"
 
-    - name: "Add stuff to .bashrc"
-      become: yes
-      become_user: user_this
-      lineinfile:
-         path: /home/user_this/.bashrc
-         line: "export PATH=/usr/bin:$PATH"
-         state: present
+#    - name: "Add stuff to .bashrc"
+#      become: yes
+#      become_user: "{{ user }}"
+#      lineinfile:
+#         path: /home/{{ user }}/.bashrc
+#         line: "export PATH=/usr/bin:$PATH"
+#         state: present
 
-    - name: "Add stuff to .bashrc"
-      become: yes
-      become_user: user_this
-      lineinfile:
-         path: /home/user_this/.bashrc
-         line: "export DOCKER_HOST=unix:///run/user/1000/docker.sock"
-         state: present
+#    - name: "Add stuff to .bashrc"
+#      become: yes
+#      become_user: "{{ user }}"
+#      lineinfile:
+#         path: /home/{{ user }}/.bashrc
+#         line: "export DOCKER_HOST=unix:///run/user/1001/docker.sock"
+#         state: present
 
-    - name: stop and disable docker service
+    - name: stop and disable root docker service
       service:
         name: docker
         state: stopped
         enabled: false
 
-    - name: stop and disable docker.socket service
+    - name: stop and disable root docker.socket service
       service:
         name: docker.socket
         state: stopped
@@ -804,14 +804,6 @@
   handlers:
 
 
-    - name: stop docker
-
-      service:
-
-        name: docker
-
-        state: stopped
-
     - name: restart fail2ban
 
       service:
@@ -823,10 +815,6 @@
       when: reboot_required.stat.exists == false
 
 
-
-
-
-
     - name: netplan apply
 
       command: netplan apply