v0.8.3

galaxy.yml

@@ -3,7 +3,7 @@
 namespace: uumas
 name: docker
 description: Roles for installing services in docker containers
-version: 0.8.2
+version: 0.8.3
 readme: README.md
 repository: https://git.uumas.fi/uumas/ansible-docker
 license_file: LICENSE

roles/container/defaults/main.yml

@@ -2,3 +2,5 @@
 
 docker_host_user: false
 docker_volume_type: named
+
+timezone: Etc/UTC

roles/container/meta/argument_specs.yml

@@ -96,6 +96,14 @@ argument_specs:
         description: "The port for http listener inside the container. Will be mapped to the host port defined in ports. Required if reverse_proxy_type is not none."
         type: int
         required: false
+      docker_proxy_target_protocol:
+        description: "Protocol to use for proxy connection"
+        type: str
+        required: false
+        choices:
+          - http
+          - https
+        default: http
       ports:
         description: "ports[docker_service]['http'] or ports[docker_service]['https'] defines the port on which the container will listen on for reverse proxy connections. Required if reverse_proxy_type is caddy."
         type: dict
@@ -117,3 +125,12 @@ argument_specs:
         type: list
         required: false
         elements: str
+      docker_network_mode:
+        description: "Docker container network mode"
+        type: str
+        required: false
+      timezone:
+        description: "Timezone set in the TZ env var"
+        type: str
+        required: false
+        default: Etc/UTC

roles/container/tasks/main.yml

@@ -66,7 +66,7 @@
     mounts: "{{ docker_volume_definition }}"
     published_ports: "{{ container_published_ports + docker_published_ports }}"
     labels: "{{ traefik_labels | default(omit) }}"
-    env: "{{ docker_env | combine(docker_additional_env) }}"
+    env: "{{ docker_env | combine(docker_additional_env) | combine({'TZ': timezone}) }}"
     entrypoint: "{{ docker_entrypoint | default(omit) }}"
     restart_policy: always
     network_mode: "{{ docker_network_mode | default(omit) }}"

roles/uisp/README.md

@@ -0,0 +1 @@
+Sets up an UISP docker container.

roles/uisp/meta/argument_specs.yml

@@ -0,0 +1,35 @@
+---
+
+argument_specs:
+  main:
+    short_description: UISP container
+    description: "Sets up an UISP docker container."
+    options:
+      ports:
+        description: "ports.netflow is used directly. Others passed to container role"
+        required: true
+
+      # All options after this will be passed directly to the container role
+      docker_service_suffix:
+        description: "Passed to container role"
+        required: false
+      docker_host_user:
+        description: "Passed to container role"
+        required: false
+
+      docker_additional_services:
+        description: "Passed to container role"
+        required: false
+
+      docker_volume_type:
+        description: "Passed to container role"
+        required: false
+      reverse_proxy_type:
+        description: "Passed to container role"
+        required: false
+      docker_vhost_domains:
+        description: "Passed to container role"
+        required: false
+      docker_entrypoint:
+        description: "Passed to container role"
+        required: false

roles/uisp/tasks/main.yml

@@ -0,0 +1,18 @@
+---
+
+- name: UISP container
+  import_role:
+    name: container
+  vars:
+    docker_service: uisp
+    docker_proxy_target_protocol: https
+    docker_image: nico640/docker-unms
+    docker_image_http_port: 8443
+    docker_mounts:
+      - name: config
+        path: /config
+    docker_published_ports:
+      - "0.0.0.0:{{ ports.uisp.netflow }}:2055"
+    docker_env:
+      HTTPS_PORT: "8443"
+      PUBLIC_HTTPS_PORT: "443"