From 2527c59e55c3dc4800bf219bb381542870b98bdc Mon Sep 17 00:00:00 2001 From: Dessalines Date: Thu, 22 Oct 2020 10:32:56 -0400 Subject: [PATCH] Fixing ansible for ubuntu 20.04 (#1218) * Fixing ansible for ubuntu 20.04 * Changing federation to false. --- ansible/lemmy.yml | 2 +- ansible/templates/config.hjson | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ansible/lemmy.yml b/ansible/lemmy.yml index 28179ba41..be4cea624 100644 --- a/ansible/lemmy.yml +++ b/ansible/lemmy.yml @@ -12,7 +12,7 @@ - name: install python for Ansible # python2-minimal instead of python-minimal for ubuntu 20.04 and up - raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal python-setuptools) + raw: test -e /usr/bin/python || (apt -y update && apt install -y python3-minimal python3-setuptools) args: executable: /bin/bash register: output diff --git a/ansible/templates/config.hjson b/ansible/templates/config.hjson index ac4d76d21..2e60ffc24 100644 --- a/ansible/templates/config.hjson +++ b/ansible/templates/config.hjson @@ -21,4 +21,16 @@ smtp_from_address: "noreply@{{ domain }}" use_tls: false } + # settings related to activitypub federation + federation: { + # whether to enable activitypub federation. + enabled: false + # Allows and blocks are described here: + # https://dev.lemmy.ml/docs/administration_federation.html#instance-allowlist-and-blocklist + # + # comma separated list of instances with which federation is allowed + # allowed_instances: "" + # comma separated list of instances which are blocked from federating + # blocked_instances: "" + } }