From: Dessalines <dessalines@users.noreply.github.com>
Date: Thu, 22 Oct 2020 14:32:56 +0000 (-0400)
Subject: Fixing ansible for ubuntu 20.04 (#1218)
X-Git-Url: http://these/git/%7B%60%24%7BarchiveTodayUrl%7D/static/%24%7Bargs.pageFn.prev%7D?a=commitdiff_plain;h=2527c59e55c3dc4800bf219bb381542870b98bdc;p=lemmy.git

Fixing ansible for ubuntu 20.04 (#1218)

* Fixing ansible for ubuntu 20.04

* Changing federation to false.
---

diff --git a/ansible/lemmy.yml b/ansible/lemmy.yml
index 28179ba4..be4cea62 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 ac4d76d2..2e60ffc2 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: ""
+  }
 }