add initial homeserver.yaml

ansible/playbook/runa.yml

@@ -6,6 +6,12 @@
         name: base
       tags:
         - base
+    - name: Add synapse configuration
+      include_role:
+        name: synapse-base
+      tags:
+        - synapse
+      when: '"synapse" in docker_compose'
     - name: Add docker-compose
       include_role:
         name: docker-compose

ansible/roles/base/tasks/main.yml

@@ -1,14 +1,4 @@
 ---
-# Cannot use the standard, hosts use /etc/ssh/keys/%u
-# - name: Add SSH public keys
-#   authorized_key:
-#     user: "nschottelius"
-#     state: present
-#     key: "{{ item }}"
-#   with_items: "{{ ssh_keys }}"
-#   tags:
-#     - base
-#     - ssh
 - name: Add SSH public keys
   ansible.builtin.template:
     src: authorized_keys.j2
@@ -19,28 +9,3 @@
   tags:
     - ssh
     - base
-- name:
-  authorized_key:
-    user: "nschottelius"
-    state: present
-    key: "{{ item }}"
-  with_items: "{{ ssh_keys }}"
-  tags:
-    - base
-    - ssh
-- name: Mount data NFS volume
-  ansible.posix.mount:
-    src: 10.165.71.1:/mtx_syna_lat_internal_ru
-    path: /mnt
-    state: mounted
-    fstype: nfs
-  when: '"synapse" in docker_compose'
-- name: Create docker-compose project directories
-  ansible.builtin.file:
-    path: /mnt/synapse_data
-    state: directory
-    mode: '0700'
-    owner: "{{ ansible_user }}"
-  tags:
-    - directory
-  when: '"synapse" in docker_compose'

ansible/roles/docker-compose/files/synapse/.env

@@ -1,4 +1,4 @@
 SYNAPSE_VERSION=v1.92.3
 
-HOME_SERVER_FQDN=corp-serv.net
-SYNAPSE_FQDN=synapse.corp-apps.com
+SYNAPSE_SERVER_NAME=corp-serv.net
+NGINX_SYNAPSE_FQDN=synapse.corp-apps.com

ansible/roles/docker-compose/files/synapse/docker-compose.yaml

@@ -3,12 +3,13 @@ services:
   synapse:
     image: matrixdotorg/synapse:${SYNAPSE_VERSION}
     environment:
-      - SYNAPSE_CONFIG_PATH=/data/homeserver.yaml
-      - SERVERNAME=${HOME_SERVER_FQDN}
-      - PUBLICBASEURL=${SYNAPSE_FQDN}
     ports:
       - "8008:8008/tcp"
     volumes:
       - /mnt/synapse_data:/data
-    entrypoint: sh -c "/data/homeserver.yaml.sh && chmod -R 777 /data  && /start.py"
+      - ./config:/config
+    command:
+      - run
+      - --config-path=/config/homeserver.yaml
+#      - --config-path=/config/generic_worker.yaml
     restart: always

ansible/roles/synapse-base/tasks/main.yml

@@ -0,0 +1,22 @@
+- name: Mount data NFS volume
+  ansible.posix.mount:
+    src: 10.165.71.1:/mtx_syna_lat_internal_ru
+    path: /mnt
+    state: mounted
+    fstype: nfs
+- name: Create docker-compose project directories
+  ansible.builtin.file:
+    path: /mnt/synapse_data
+    state: directory
+    mode: '0700'
+    owner: "{{ ansible_user }}"
+  tags:
+    - directory
+# - name: Create homeserver.yaml file
+#   ansible.builtin.copy:
+#     src: files/homeserver.yaml
+#     dest: /mnt/synapse_data/homeserver.yaml
+#     owner: "{{ ansible_user }}"
+#     mode: '0600'
+#   tags:
+#     - files