Fix deprecated commands, move to python3 executor

3 files changed, 22 insertions, 21 deletions

diff --git a/base_apps.yml b/base_apps.yml
index 76e2365..54752d4 100644
--- a/base_apps.yml
+++ b/base_apps.yml
@@ -15,27 +15,26 @@
       update_cache: true
   - name: Base packages
     apt:
-      name: "{{ item }}"
-    with_items:
-    - tmux
-    - htop
-    - syncthing
-    - docker-ce
-    - tig
-    - git
-    - hugo
-    - rsync
-    - python-pip
-    - mc
+      name:
+        - tmux
+        - htop
+        - syncthing
+        - docker-ce
+        - tig
+        - git
+        - rsync
+        - python-pip
+        - mc
+        - mosh
   - name: Upgrade all packages
     apt:
       upgrade: full
   - name: Install docker-compose
     pip:
-      name: "{{ item }}"
-    with_items:
-    - docker
-    - docker-compose
+      executable: pip3
+      name:
+        - docker
+        - docker-compose
 
   - name: Enable services
     systemd:
diff --git a/docker.yml b/docker.yml
index 3a1c364..c426404 100644
--- a/docker.yml
+++ b/docker.yml
@@ -26,7 +26,7 @@
     with_items: "{{domains | dict2items}}"
 
   - name: Counter app
-    docker_service:
+    docker_compose:
       project_name: app
       build: yes
       definition:
@@ -41,7 +41,7 @@
             image: "redis:alpine"
             restart: always
   - name: nginx
-    docker_service:
+    docker_compose:
       project_name: nginx
       build: yes
       definition:
@@ -116,7 +116,7 @@
             volumes:
               - db/:/var/lib/postgresql/data
   - name: grafana
-    docker_service:
+    docker_compose:
       project_name: monitoring
       restarted: true
       definition:
@@ -154,7 +154,7 @@
               - "/dev/disk:/dev/disk:ro"
             restart: always
   - name: registry
-    docker_service:
+    docker_compose:
       project_name: registry
       definition:
         version: '3'
@@ -176,7 +176,7 @@
             restart: always
 
   - name: vpn
-    docker_service:
+    docker_compose:
       project_name: vpn
       definition:
         version: '3'
diff --git a/hosts b/hosts
index 3267a00..b5dfc98 100644
--- a/hosts
+++ b/hosts
@@ -1,2 +1,4 @@
 [tamriel]
 new.dybiec.info
+[tamriel:vars]
+ansible_python_interpreter=/usr/bin/python3