Changeset e896e227 in darkpeak-services


Ignore:
Timestamp:
Oct 13, 2018, 2:25:13 PM (2 years ago)
Author:
Caolan McMahon <caolan.mcmahon@…>
Branches:
matrix
Parents:
7b1d23e2
Message:

matrix: tweaks to web client attempting to get auth with custom server to work

Location:
roles/matrix
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • roles/matrix/defaults/main.yml

    r7b1d23e2 re896e227  
    33domain: "{{ subdomain }}.{{ domain_name }}"
    44
    5 riot_web_version: "v0.16.3"
     5riot_web_version: "v0.16.6"
    66web_root: "{{ default_web_root }}/{{ service_name }}/riot-{{ riot_web_version }}"
    77
  • roles/matrix/tasks/main.yml

    r7b1d23e2 re896e227  
    8181    src: "https://github.com/vector-im/riot-web/releases/download/{{ riot_web_version }}/riot-{{ riot_web_version }}.tar.gz"
    8282    remote_src: yes
    83     dest: "{{ web_root }}"
     83    dest: "/tmp"
     84    creates: "/tmp/riot-{{ riot_web_version }}"
     85
     86- name: Copy riot-web to web root
     87  shell: "cp -r /tmp/riot-{{ riot_web_version }}/* {{ web_root }}"
    8488
    8589- name: Configure riot-web
  • roles/matrix/templates/homeserver.yaml

    r7b1d23e2 re896e227  
    7676
    7777# Whether to serve a web client from the HTTP/HTTPS root resource.
    78 web_client: False
     78web_client: True
    7979
    8080# The root directory to server for the above web client.
     
    8686# The public-facing base URL for the client API (not including _matrix/...)
    8787# public_baseurl: https://example.com:8448/
     88public_baseurl: https://{{ domain }}/
    8889
    8990# Set the soft limit on the number of file descriptors synapse can use
     
    391392# identifiers by this server.
    392393trusted_third_party_id_servers:
    393     - matrix.org
    394     - vector.im
    395     - riot.im
     394    - "{{ domain }}"
    396395
    397396# Users who register on this homeserver will automatically be joined
     
    544543        mail: "email"
    545544        name: "givenName"
     545     #bind_dn:
     546     #bind_password:
     547     #filter: "(objectClass=posixAccount)"
    546548
    547549# Clients requesting push notifications can either have the body of
  • roles/matrix/templates/riot-config.json

    r7b1d23e2 re896e227  
    22    "default_hs_url": "https://{{ domain }}",
    33    "default_is_url": "https://{{ domain }}",
    4     "disable_custom_urls": true,
     4    "disable_custom_urls": false,
    55    "disable_guests": true,
    66    "disable_login_language_selector": false,
     
    2020    "roomDirectory": {
    2121        "servers": [
    22             "matrix.org"
     22            "{{ domain }}"
    2323        ]
    2424    },
     
    2626    "piwik": {
    2727        "url": "https://piwik.riot.im/",
    28         "whitelistedHSUrls": ["https://matrix.org"],
    29         "whitelistedISUrls": ["https://vector.im", "https://matrix.org"],
     28        "whitelistedHSUrls": ["https://{{ domain }}"],
     29        "whitelistedISUrls": ["https://{{ domain }}"],
    3030        "siteId": 1
    3131    },
    3232    "enable_presence_by_hs_url": {
    33         "https://matrix.org": false
     33        "https://{{ domain }}": true
    3434    }
    3535}
Note: See TracChangeset for help on using the changeset viewer.