about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaweł Dybiec <pawel.to.malpa@gmail.com>2019-04-17 16:35:30 +0200
committerPaweł Dybiec <pawel.to.malpa@gmail.com>2019-04-17 16:35:30 +0200
commit884d989356694bda2017bc1088debe60a3d72c24 (patch)
tree39f589102e241a831b1ba139797294dcf4817d71
parentopenvpn and docker registry (diff)
Comment and cleanup ansible configs
-rw-r--r--base_apps.yml18
-rw-r--r--docker.yml13
2 files changed, 14 insertions, 17 deletions
diff --git a/base_apps.yml b/base_apps.yml
index b3e980e..2534efd 100644
--- a/base_apps.yml
+++ b/base_apps.yml
@@ -4,10 +4,13 @@
     remote_user: ansible_worker
     become: yes
     tasks:
-    - apt_key:
+    - name: docker gpg keys
+      apt_key:
         url: https://download.docker.com/linux/debian/gpg
-    - apt: name=apt-transport-https
-    - apt_repository:
+    - name: Ensure apt has https transport
+      apt: name=apt-transport-https
+    - name: docker debian repository
+      apt_repository:
         repo: deb [arch=amd64] https://download.docker.com/linux/debian stretch stable 
         update_cache: true
     - name: Base packages
@@ -24,15 +27,18 @@
       - rsync
       - python-pip
       - mc
-    - apt:
+    - name: Upgrade all packages
+      apt:
         upgrade: full
-    - pip:
+    - name: Install docker-compose
+      pip:
         name: "{{ item }}"
       with_items:
       - docker
       - docker-compose
 
-    - systemd:
+    - name: Enable services
+      systemd:
         enabled: true
         state: started
         name: "{{ item }}"
diff --git a/docker.yml b/docker.yml
index 81fcfcd..05812f1 100644
--- a/docker.yml
+++ b/docker.yml
@@ -3,33 +3,24 @@
     hosts: tamriel
     remote_user: ansible_worker
     tasks:
-    - synchronize:
+    - name: synchronize docker composefiles
+      synchronize:
         src: composer/
         dest: composer
     - name: counter app
       docker_service:
-        build: yes
         project_src: composer/app
     - name: nginx
       docker_service:
-        recreate: always
-        build: yes
         project_src: composer/nginx
     - name: gitea
       docker_service:
-        #recreate: always
-        #build: yes
         project_src: composer/gitea
     - name: grafana
       docker_service:
-        recreate: always
-        build: yes
-        #state: absent
         project_src: composer/grafana
     - name: registry
       docker_service:
-        #recreate: always
-        #build: yes
         project_src: composer/registry
     - name: vpn
       docker_service: