diff --git a/conf/compose/element.docker-compose.yml b/conf/compose/element.docker-compose.yml index 89c03bb..23932b6 100644 --- a/conf/compose/element.docker-compose.yml +++ b/conf/compose/element.docker-compose.yml @@ -66,8 +66,6 @@ services: configs: - source: element-json-config target: /app/config.json - - source: element-nginx-config - target: /etc/nginx/conf.d/default.conf configs: synapse-homeserver-config: @@ -82,7 +80,4 @@ configs: element-json-config: file: ../element/config.json external: false - element-nginx-config: - file: ../element/nginx.conf - external: false diff --git a/conf/element/nginx.conf b/conf/element/nginx.conf deleted file mode 100644 index 5082420..0000000 --- a/conf/element/nginx.conf +++ /dev/null @@ -1,25 +0,0 @@ -server { - listen 8001; - server_name localhost; - - root /usr/share/nginx/html; - index index.html; - - # Set no-cache for the version, config and index.html - # so that browsers always check for a new copy of Element Web. - # NB http://your-domain/ and http://your-domain/? are also covered by this - - location = /index.html { - add_header Cache-Control "no-cache"; - } - location = /version { - add_header Cache-Control "no-cache"; - } - # covers config.json and config.hostname.json requests as it is prefix. - location /config { - add_header Cache-Control "no-cache"; - } - # redirect server error pages to the static page /50x.html - # - error_page 500 502 503 504 /50x.html; -} diff --git a/install.sh b/install.sh index 3463b18..2b278fd 100755 --- a/install.sh +++ b/install.sh @@ -89,7 +89,7 @@ matrix_config () { printf "rc_registration:\n per_second: 0.1 \n burst_count: 2\n" >> $DCOMMS_DIR/conf/synapse/homeserver.yaml printf "presence:\n enabled: false\n" >> $DCOMMS_DIR/conf/synapse/homeserver.yaml printf "database:\n name: psycopg2\n txn_limit: 10000\n args:\n" >> $DCOMMS_DIR/conf/synapse/homeserver.yaml - printf " user: postgres\n password: null\n database: synapse\n host: localhost\n" >> $DCOMMS_DIR/conf/synapse/homeserver.yaml + printf " user: postgres\n password: null\n database: synapse\n host: synapse-pg\n" >> $DCOMMS_DIR/conf/synapse/homeserver.yaml printf " port: 5432\n cp_min: 5\n cp_max: 10\n" >> $DCOMMS_DIR/conf/synapse/homeserver.yaml sed -i "s/TEMPLATE/$DWEB_DOMAIN/" $DCOMMS_DIR/conf/element/config.json