diff options
| -rw-r--r-- | dan/sk-cloudia.yml | 1 | ||||
| -rw-r--r-- | inventory/host_vars/sk-cloudia/vars.yml | 1 | ||||
| -rw-r--r-- | roles/collabora/code/templates/nginx-vhost.conf.j2 | 2 | ||||
| -rw-r--r-- | roles/elevate/media/templates/nextcloud-nginx.conf.j2 | 2 | ||||
| -rw-r--r-- | roles/etherpad-lite/templates/nginx-vhost.conf.j2 | 2 | ||||
| -rw-r--r-- | roles/kubernetes/base/tasks/main.yml | 4 |
6 files changed, 7 insertions, 5 deletions
diff --git a/dan/sk-cloudia.yml b/dan/sk-cloudia.yml index e730252e..b83db411 100644 --- a/dan/sk-cloudia.yml +++ b/dan/sk-cloudia.yml @@ -14,3 +14,4 @@ - role: nginx/base - role: nextcloud - role: collabora/code + - role: etherpad-lite diff --git a/inventory/host_vars/sk-cloudia/vars.yml b/inventory/host_vars/sk-cloudia/vars.yml index f239ad4a..e80b0cb9 100644 --- a/inventory/host_vars/sk-cloudia/vars.yml +++ b/inventory/host_vars/sk-cloudia/vars.yml @@ -29,6 +29,7 @@ kubelet_zfs: name: kubelet size: 20G +kubernetes_version: 1.16.1 kubernetes_container_runtime: containerd kubernetes_standalone_max_pods: 42 kubernetes_standalone_resolv_conf: /var/run/systemd/resolve/resolv.conf diff --git a/roles/collabora/code/templates/nginx-vhost.conf.j2 b/roles/collabora/code/templates/nginx-vhost.conf.j2 index c0186df2..cec811f9 100644 --- a/roles/collabora/code/templates/nginx-vhost.conf.j2 +++ b/roles/collabora/code/templates/nginx-vhost.conf.j2 @@ -16,7 +16,7 @@ server { server_name {{ item.value.hostnames | join(' ') }}; include snippets/acmetool.conf; - include snippets/ssl.conf; + include snippets/tls.conf; ssl_certificate /var/lib/acme/live/{{ item.value.hostnames[0] }}/fullchain; ssl_certificate_key /var/lib/acme/live/{{ item.value.hostnames[0] }}/privkey; include snippets/hsts.conf; diff --git a/roles/elevate/media/templates/nextcloud-nginx.conf.j2 b/roles/elevate/media/templates/nextcloud-nginx.conf.j2 index e6faf4ed..16d510eb 100644 --- a/roles/elevate/media/templates/nextcloud-nginx.conf.j2 +++ b/roles/elevate/media/templates/nextcloud-nginx.conf.j2 @@ -20,7 +20,7 @@ server { server_name {{ nextcloud_hostnames | join(' ') }}; include snippets/acmetool.conf; - include snippets/ssl.conf; + include snippets/tls.conf; ssl_certificate /var/lib/acme/live/{{ nextcloud_hostnames[0] }}/fullchain; ssl_certificate_key /var/lib/acme/live/{{ nextcloud_hostnames[0] }}/privkey; include snippets/hsts.conf; diff --git a/roles/etherpad-lite/templates/nginx-vhost.conf.j2 b/roles/etherpad-lite/templates/nginx-vhost.conf.j2 index 9bca4f22..b59701fc 100644 --- a/roles/etherpad-lite/templates/nginx-vhost.conf.j2 +++ b/roles/etherpad-lite/templates/nginx-vhost.conf.j2 @@ -16,7 +16,7 @@ server { server_name {{ item.value.hostnames | join(' ') }}; include snippets/acmetool.conf; - include snippets/ssl.conf; + include snippets/tls.conf; ssl_certificate /var/lib/acme/live/{{ item.value.hostnames[0] }}/fullchain; ssl_certificate_key /var/lib/acme/live/{{ item.value.hostnames[0] }}/privkey; include snippets/hsts.conf; diff --git a/roles/kubernetes/base/tasks/main.yml b/roles/kubernetes/base/tasks/main.yml index 731be48b..dc6ec225 100644 --- a/roles/kubernetes/base/tasks/main.yml +++ b/roles/kubernetes/base/tasks/main.yml @@ -31,13 +31,13 @@ - name: install kubelet and utils apt: name: - - "kubelet{% if kubernetes.pkg_version is defined %}={{ kubernetes.pkg_version }}{% endif %}" + - "kubelet{% if kubernetes_version is defined %}={{ kubernetes_version }}-00{% endif %}" - cri-tools - bridge-utils state: present - name: disable automatic upgrades for kubelet - when: kubernetes.pkg_version is defined + when: kubernetes_version is defined loop: - kubelet dpkg_selections: |