1 files changed, 37 insertions, 86 deletions
diff --git a/docker.yml b/docker.yml
index 93c5eb8..97d114e 100644
--- a/docker.yml
+++ b/docker.yml
@@ -1,7 +1,7 @@
 ---
 - name: Docker apps
   hosts: tamriel
-  remote_user: ansible_worker
+  remote_user: root
   vars:
     docker_compose_dir: "~/compose"
   vars_files:
@@ -16,32 +16,47 @@
     synchronize:
       src: compose/
       dest: "{{docker_compose_dir}}"
+  - name: Copy main nginx.conf
+    copy:
+      src: nginx/nginx.conf
+      dest: /etc/nginx/nginx.conf
+      mode: '0644'
+      owner: root
+      group: root
+  - name: Copy nginx site files
+    copy:
+      src: nginx/conf.d/
+      dest: /etc/nginx/conf.d
+      mode: '0644'
+      owner: root
+      group: root
   - name: Generate nginx conf
     template:
       src: templates/nginx.conf.j2
-      dest: "{{docker_compose_dir}}/nginx/conf.d/{{short_name}}.conf"
+      dest: "/etc/nginx/conf.d/{{short_name}}.conf"
     vars:
       server: "{{item.value}}"
       short_name: "{{item.key}}"
     with_items: "{{domains | dict2items}}"
     when: (item.value.disabled is undefined) or (item.value.disabled != true)
-  - name: nginx
-    docker_compose:
-      project_name: nginx
-      pull: yes
-      build: yes
-      restarted: yes
-      definition:
-        version: '3'
-        services:
-          main:
-            build: "{{docker_compose_dir}}/nginx"
-            network_mode: host
-            volumes:
-            - "/etc/letsencrypt/live/dybiec.info:/etc/letsencrypt/live/dybiec.info:ro"
-            - "/etc/letsencrypt/archive/dybiec.info:/etc/letsencrypt/archive/dybiec.info:ro"
-            restart: always
-
+  - name: Copy sites
+    copy:
+      src: nginx/main/
+      dest: /var/www/html
+      mode: '0644'
+      owner: www-data
+      group: www-data
+  - name: Copy sites
+    copy:
+      src: nginx/darling/
+      dest: /var/www/html/darling
+      mode: '0644'
+      owner: www-data
+      group: www-data
+  - name: reload nginx conf
+    systemd:
+      name: nginx
+      state: reloaded
   - name: counter app
     docker_compose:
       project_name: app
@@ -71,83 +86,19 @@
             ports:
              - "127.0.0.1:{{domains.cs.proxy.port}}:5000"
             restart: always
-
-  - name: gitea
-    docker_compose:
-      project_name: gitea
-      pull: yes
-      definition:
-        version: '2'
-        volumes:
-          data:
-            external:
-              name: gitea_data
-          db:
-            external:
-              name: gitea_db
-        networks:
-          gitea:
-            external: false
-        services:
-          web:
-            image: gitea/gitea:latest
-            volumes:
-              - data:/data
-            ports:
-              - "127.0.0.1:{{domains.git.proxy.port}}:3000"
-              - "2022:2022"
-            environment:
-              - DB_TYPE=postgres
-              - DB_HOST=db:5432
-              - DB_NAME=gitea
-              - DB_USER=gitea
-              - "DB_PASSW={{gitea_db_password}}"
-              - HTTP_PORT=3000
-              - "ROOT_URL=https://{{domains.git.name}}"
-              - SSH_DOMAIN=git.dybiec.info
-              - SSH_PORT=2022
-              - "APP_NAME={{domains.git.name}}"
-              - DISABLE_REGISTRATION=true
-              - INSTALL_LOCK=true
-              - RUN_MODE=prod
-              - OFFLINE_MODE=true
-            networks:
-              - gitea
-            depends_on:
-              - db
-            restart: always
-          redis:
-            image: "redis:alpine"
-            restart: always
-            networks:
-            - gitea
-          db:
-            image: postgres:11
-            restart: always
-            environment:
-              - POSTGRES_USER=gitea
-              - "POSTGRES_PASSWORD={{gitea_db_password}}"
-              - POSTGRES_DB=gitea
-            networks:
-              - gitea
-            volumes:
-              - db/:/var/lib/postgresql/data
   - name: vpn
     docker_compose:
       project_name: vpn
       pull: yes
-      restarted: true
+      build: yes
+      #state: absent
       definition:
         version: '3'
-        volumes:
-          openvpn-certs:
-            external:
-              name: openvpn-pawel
         services:
           openvpn:
             image: kylemanna/openvpn
             network_mode: host
             volumes:
-              - "openvpn-certs:/etc/openvpn"
+              - "/root/openvpn:/etc/openvpn"
             privileged: true
             restart: always