docker: add convenience packages

Create a single external network called "external".
Create container-specific networks.
Only a few containers need access to these.
So far: openldap, postgres.

roles/authelia/tasks/main.yml

@@ -17,8 +17,8 @@
     ports:
       - "9091:9091"
     networks:
-      - name: bridge
+      - name: external
-      - name: nginx-internal
+      - name: openldap
     volumes:
       - "{{ data_folder }}/authelia:/config"
 - name: copy nginx endpoint conf

roles/authelia/templates/authelia.conf.j2

@@ -1,7 +1,7 @@
 server {
-    listen 80;
     server_name auth.{{ base_domain }};
-    return 301 https://$host$request_uri;
+    listen 80;
+    return 301 https://$server_name$request_uri;
 }
 
 server {

roles/authelia/templates/configuration.yml.j2

@@ -26,11 +26,19 @@ authentication_backend:
     password: {{ vault_openldap_admin_password }}
 access_control:
   default_policy: deny
+  networks:
+    - name: local
+      networks:
+        - 192.168.0.0/24
   rules:
     - domain: "*.{{ base_domain }}"
+      networks:
+        - local
       policy: bypass
     - domain: portainer.{{ base_domain }}
       policy: one_factor
+    - domain: keycloak.{{ base_domain }}
+      policy: one_factor
 session:
   name: authelia_session
   secret: somerandomsecret

roles/docker/tasks/main.yml

@@ -3,6 +3,9 @@
     name:
       - docker
       - python-pip
+      - neovim
+      - fish
+      - curlie
     state: present
     update_cache: true
 - name: start
@@ -12,8 +15,9 @@
 - name: add user to group
   user:
     name: lukas
-    groups: docker
+    groups: docker,wheel
     append: true
+    shell: /usr/bin/fish
 - name: install python docker
   pip:
     name:

roles/jellyfin/tasks/main.yml

@@ -12,7 +12,7 @@
     name: 'jellyfin'
     image: linuxserver/jellyfin
     networks:
-      - name: nginx-internal
+      - name: external
     volumes:
       - "{{ data_folder }}/jellyfin:/config"
       - "{{ media.tv }}:/data/tv"

roles/jellyfin/templates/jellyfin.conf.j2

@@ -1,6 +1,7 @@
 server {
+    server_name "jellyfin.{{ base_domain }}";
     listen 80;
-    return 301 https://$host$request_uri;
+    return 301 https://$server_name$request_uri;
 }
 
 server {

roles/keycloak/tasks/main.yml

@@ -5,8 +5,9 @@
     ports:
       - "8080:8080"
     networks:
+      - name: external
       - name: postgres
-      - name: nginx-internal
+      - name: openldap
     env:
       "KEYCLOAK_USER": "{{ vault_keycloak_user }}"
       "KEYCLOAK_PASSWORD": "{{ vault_keycloak_password }}"
@@ -20,6 +21,6 @@
 - name: copy nginx conf
   template:
     src: "keycloak.conf.j2"
-    dest: "{{ data_folder }}/nginx/conf.d/{{ role_name}}.{{ base_domain }}.conf"
+    dest: "{{ data_folder }}/nginx/conf.d/{{ role_name }}.{{ base_domain }}.conf"
     mode: "755"
   notify: reload nginx

roles/keycloak/templates/keycloak.conf.j2

@@ -1,6 +1,7 @@
 server {
+    server_name "keycloak.{{ base_domain }}";
     listen 80;
-  return 301 https://$host$request_uri;
+    return 301 https://$server_name$request_uri;
 }
 
 server {

roles/nginx/tasks/main.yml

@@ -14,11 +14,11 @@
 - name: generate self-signed certs
   import_tasks: self-signed.yml
   when: self_signed
-- name: create nginx bridge network
+- name: create external bridge network
   docker_network:
-    name: nginx-internal
+    name: external
     attachable: true
-    internal: true
+    internal: false
     state: present
 - name: copy nginx.conf
   template:
@@ -37,8 +37,7 @@
     name: 'nginx'
     image: nginx
     networks:
-      - name: bridge
+      - name: external
-      - name: nginx-internal
     volumes:
       - "{{ data_folder }}/nginx/conf.d:/etc/nginx/conf.d"
       - "{{ data_folder }}/nginx/nginx.conf:/etc/nginx/nginx.conf"

roles/openldap/tasks/main.yml

@@ -6,13 +6,19 @@
   loop:
     - "{{ data_folder }}/openldap"
     - "{{ data_folder }}/openldap/data"
+- name: create network
+  docker_network:
+    name: openldap
+    attachable: true
+    internal: true
+    state: present
 - name: run container
   docker_container:
     name: "openldap"
     image: osixia/openldap
     hostname: openldap
     networks:
-      - name: nginx-internal
+      - name: openldap
     ports:
       - "389:389"
       - "636:636"

roles/portainer/tasks/main.yml

@@ -3,8 +3,8 @@
     name: 'portainer'
     image: portainer/portainer-ce
     networks:
-      - name: nginx-internal
+      - name: external
-      - name: bridge
+      - name: openldap
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
     ports:

roles/portainer/templates/portainer.conf.j2

@@ -1,7 +1,7 @@
 server {
-    listen 80;
     server_name portainer.{{ base_domain }};
-    return 301 https://$host$request_uri;
+    listen 80;
+    return 301 https://$server_name$request_uri;
 }
 
 server {