kunsi/bundlewrap
1
0
Fork 0
Code Issues 1 Pull requests 1 Releases Activity

bundles/pleroma: allow database configuration
Some checks failed
bundlewrap/pipeline/head There was a failure building this commit
Details

Browse source
This commit is contained in:
Franzi 2021-02-20 20:02:26 +01:00
parent f8c157ce50
commit 017c2c3421
Signed by: kunsi
GPG key ID: 12E3D2136B818350
3 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bundles/pleroma/files/pleroma.config.exs
View file

@ -1,23 +1,15 @@
import Config import Config
config :pleroma,
configurable_from_database: true
config :pleroma, Pleroma.Web.Endpoint, config :pleroma, Pleroma.Web.Endpoint,
url: [host: "${node.metadata['pleroma']['url']}", scheme: "https", port: 443], url: [host: "${node.metadata['pleroma']['url']}", scheme: "https", port: 443],
http: [port: 21000, ip: {127, 0, 0, 1}], http: [port: 21000, ip: {127, 0, 0, 1}],
secret_key_base: "${node.metadata['pleroma']['secret_key']}", secret_key_base: "${node.metadata['pleroma']['secret_key']}",
secure_cookie_flag: true secure_cookie_flag: true
config :pleroma, :http_security,
enabled: false,
sts: true,
referrer_policy: "same-origin"
config :pleroma, :instance, 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/" static_dir: "/var/pleroma/static/"
config :pleroma, Pleroma.Upload, config :pleroma, Pleroma.Upload,

8
bundles/pleroma/metadata.py
View file

@ -6,6 +6,11 @@ defaults = {
'libimage-exiftool-perl': {}, 'libimage-exiftool-perl': {},
}, },
}, },
'backups': {
'paths': {
'/var/pleroma',
},
},
'zfs': { 'zfs': {
'datasets': { 'datasets': {
'tank/pleroma-data': { 'tank/pleroma-data': {
@ -13,9 +18,6 @@ defaults = {
}, },
}, },
}, },
'pleroma': {
'admin_email': 'pleroma@{}'.format(node.hostname),
},
'postgresql': { 'postgresql': {
'roles': { 'roles': {
'pleroma': { 'pleroma': {

3
nodes/htz-cloud/pleroma.py
View file

@ -31,9 +31,6 @@ nodes['htz-cloud.pleroma'] = {
}, },
'pleroma': { 'pleroma': {
'version': '2.2.2', 'version': '2.2.2',
'url': 'cybert-media.net',
'title': 'CYBERt Media',
'description': '',
'secret_key': vault.decrypt('encrypt$gAAAAABgMVXXclfxVY022fM0Fdf94Oh3sxVlK0lYyBO_CsQFEbZcMua3w1oJY8_9d1JcrCJSSeBRTDnt-ZkRCQ6xKoALo8Rl7s9DPxa7J0vHdkggeZ3IHaOyXBcBPdx8vILyKDLHRXacaynOUBOjy6RIl6Qf2wH1ASbphCcjD-Njricg4PG6Rcixm87fF60rLBjAAkRoz5ZQnXlut1rhjLj-z-7UpA68fkeyPVJXbroWBJdmvCUt92dwjuGARsku2XI22mVvjtJJ'), 'secret_key': vault.decrypt('encrypt$gAAAAABgMVXXclfxVY022fM0Fdf94Oh3sxVlK0lYyBO_CsQFEbZcMua3w1oJY8_9d1JcrCJSSeBRTDnt-ZkRCQ6xKoALo8Rl7s9DPxa7J0vHdkggeZ3IHaOyXBcBPdx8vILyKDLHRXacaynOUBOjy6RIl6Qf2wH1ASbphCcjD-Njricg4PG6Rcixm87fF60rLBjAAkRoz5ZQnXlut1rhjLj-z-7UpA68fkeyPVJXbroWBJdmvCUt92dwjuGARsku2XI22mVvjtJJ'),
}, },
'vm': { 'vm': {