Merge pull request 'dev' (#26) from dev into master

Reviewed-on: http://89.110.105.223:8080/IaC/rproxy/pulls/26

roles/rproxy/tasks/main.yml

@@ -92,7 +92,7 @@
   block:
     - name: Create repo dir
       ansible.builtin.file:
-        path: "{{ rproxy_dir }}/repo"
+        path: "{{ repo_data_dir }}"
         state: directory
         mode: 0777
 
@@ -153,7 +153,7 @@
 
     - name: Create repo dir
       ansible.builtin.file:
-        path: "{{ dockerrepo_dir }}/repo"
+        path: "{{ dockerrepo_data_dir }}"
         state: directory
 
     - name: Create certs dir

roles/rproxy/templates/docker-compose.dockerrepo.yml.j2

@@ -9,7 +9,7 @@ services:
       - REGISTRY_HTTP_TLS_CERTIFICATE=/certs/dockerrepo.crt
       - REGISTRY_HTTP_TLS_KEY=/certs/dockerrepo.key
     volumes:
-      - {{ dockerrepo_dir }}/repo:/var/lib/registry
+      - '{{ dockerrepo_data_dir }}:/var/lib/registry'
-      - {{ dockerrepo_dir }}/certs:/certs
+      - '{{ dockerrepo_dir }}/certs:/certs'
     ports:
       - 5000:5000

roles/rproxy/templates/docker-compose.rproxy.yml.j2

@@ -6,10 +6,10 @@ services:
     container_name: rproxy
     restart: always
     volumes:
-      - {{ rproxy_dir }}/nginx.conf:/etc/nginx/nginx.conf
+      - '{{ rproxy_dir }}/nginx.conf:/etc/nginx/nginx.conf'
-      - {{ rproxy_dir }}/sites:/etc/nginx/sites
+      - '{{ rproxy_dir }}/sites:/etc/nginx/sites'
-      - {{ rproxy_dir }}/certs:/etc/nginx/certs
+      - '{{ rproxy_dir }}/certs:/etc/nginx/certs'
-      - {{ rproxy_dir }}/repo:/repo
+      - '{{ repo_data_dir }}:/repo'
     ports:
       - 443:443
       - 80:80

rproxy.yml

@@ -5,7 +5,9 @@
   vars:
     ansible_python_interpreter: /usr/bin/python3
     rproxy_dir: /opt/rproxy
+    repo_data_dir: /opt/data/repo
     dockerrepo_dir: /opt/dockerrepo
+    dockerrepo_data_dir: /opt/data/dockerrepo
   
   vars_prompt:
     - name: rproxy_service_name