diff --git a/bundles/pleroma/files/pleroma.config.exs b/bundles/pleroma/files/pleroma.config.exs index f58705f..64c2c0b 100644 --- a/bundles/pleroma/files/pleroma.config.exs +++ b/bundles/pleroma/files/pleroma.config.exs @@ -1,23 +1,15 @@ import Config +config :pleroma, + configurable_from_database: true + config :pleroma, Pleroma.Web.Endpoint, url: [host: "${node.metadata['pleroma']['url']}", scheme: "https", port: 443], http: [port: 21000, ip: {127, 0, 0, 1}], secret_key_base: "${node.metadata['pleroma']['secret_key']}", secure_cookie_flag: true -config :pleroma, :http_security, - enabled: false, - sts: true, - referrer_policy: "same-origin" - config :pleroma, :instance, - name: "${node.metadata['pleroma']['title']}", - description: "${node.metadata['pleroma']['description']}", - email: "${node.metadata['pleroma']['admin_email']}", - limit: ${node.metadata['pleroma'].get('limit_chars', 500)}, - registrations_open: ${str(node.metadata['pleroma'].get('signup_enabled', False)).lower()}, - invites_enabled: ${str(node.metadata['pleroma'].get('invite_enabled', True)).lower()}, static_dir: "/var/pleroma/static/" config :pleroma, Pleroma.Upload, diff --git a/bundles/pleroma/metadata.py b/bundles/pleroma/metadata.py index 1cf5a74..8ba5634 100644 --- a/bundles/pleroma/metadata.py +++ b/bundles/pleroma/metadata.py @@ -6,6 +6,11 @@ defaults = { 'libimage-exiftool-perl': {}, }, }, + 'backups': { + 'paths': { + '/var/pleroma', + }, + }, 'zfs': { 'datasets': { 'tank/pleroma-data': { @@ -13,9 +18,6 @@ defaults = { }, }, }, - 'pleroma': { - 'admin_email': 'pleroma@{}'.format(node.hostname), - }, 'postgresql': { 'roles': { 'pleroma': { diff --git a/nodes/htz-cloud/pleroma.py b/nodes/htz-cloud/pleroma.py index a4d2afc..add2d60 100644 --- a/nodes/htz-cloud/pleroma.py +++ b/nodes/htz-cloud/pleroma.py @@ -31,9 +31,6 @@ nodes['htz-cloud.pleroma'] = { }, 'pleroma': { 'version': '2.2.2', - 'url': 'cybert-media.net', - 'title': 'CYBERt Media', - 'description': '', 'secret_key': vault.decrypt('encrypt$gAAAAABgMVXXclfxVY022fM0Fdf94Oh3sxVlK0lYyBO_CsQFEbZcMua3w1oJY8_9d1JcrCJSSeBRTDnt-ZkRCQ6xKoALo8Rl7s9DPxa7J0vHdkggeZ3IHaOyXBcBPdx8vILyKDLHRXacaynOUBOjy6RIl6Qf2wH1ASbphCcjD-Njricg4PG6Rcixm87fF60rLBjAAkRoz5ZQnXlut1rhjLj-z-7UpA68fkeyPVJXbroWBJdmvCUt92dwjuGARsku2XI22mVvjtJJ'), }, 'vm': {