Changeset e5baa8d3 in darkpeak-services


Ignore:
Timestamp:
Jul 25, 2018, 12:54:17 PM (2 years ago)
Author:
Caolan McMahon <caolan.mcmahon@…>
Branches:
ansible, keycloak, master, matrix, pleroma
Children:
ad59c712
Parents:
71ae5b2a
git-author:
Caolan McMahon <caolan.mcmahon@…> (07/25/18 12:52:56)
git-committer:
Caolan McMahon <caolan.mcmahon@…> (07/25/18 12:54:17)
Message:

Upgrade Mastodon to v2.4.3 and add some LDAP config

Location:
roles/mastodon
Files:
3 edited

Legend:

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

    r71ae5b2a re5baa8d3  
    1818
    1919acct_domain: "{{ ldap_auth_domain }}"
    20 ruby_version: 2.5.0
    21 mastodon_tag: v2.3.1
     20ruby_version: 2.5.1
     21mastodon_tag: v2.4.3
    2222rbenv_tag: v1.1.1
    23 ruby_build_tag: v20180224
     23ruby_build_tag: v20180618
    2424paperclip_secret: "{{ mastodon_paperclip_secret }}"
    2525secret_key_base: "{{ mastodon_secret_key_base }}"
  • roles/mastodon/tasks/main.yml

    r71ae5b2a re5baa8d3  
    1717    - https://dl.yarnpkg.com/debian/pubkey.gpg
    1818
    19 - name: Add apt repositories for Node.js 6.x, nodesource
     19- name: Add apt repositories for Node.js 8.x, nodesource
    2020  apt_repository:
    2121    repo: "{{ item }}"
    2222    state: present
    2323  with_items:
    24     - deb https://deb.nodesource.com/node_6.x stretch main
    25     - deb-src https://deb.nodesource.com/node_6.x stretch main
     24    - deb https://deb.nodesource.com/node_8.x stretch main
     25    - deb-src https://deb.nodesource.com/node_8.x stretch main
    2626    - deb https://dl.yarnpkg.com/debian/ stable main
    2727
  • roles/mastodon/templates/env.j2

    r71ae5b2a re5baa8d3  
    137137
    138138# LDAP authentication (optional)
    139 # LDAP_ENABLED=true
    140 # LDAP_HOST=localhost
    141 # LDAP_PORT=389
    142 # LDAP_METHOD=simple_tls
    143 # LDAP_BASE=
    144 # LDAP_BIND_DN=
    145 # LDAP_PASSWORD=
    146 # LDAP_UID=cn
     139LDAP_ENABLED=true
     140LDAP_HOST={{ ldap_server }}
     141LDAP_PORT={{ ldap_port_ssl }}
     142LDAP_METHOD=simple_tls
     143LDAP_BASE={{ ldap_basedn }}
     144LDAP_BIND_DN=
     145LDAP_PASSWORD=
     146LDAP_UID=uid
     147# using a self-signed cert for id.darkpeak.org currently
     148LDAP_TLS_NO_VERIFY=true
    147149
    148150# PAM authentication (optional)
Note: See TracChangeset for help on using the changeset viewer.