Merge pull request #30 from small-hack/features/add-more-undocumented-env-vars

Features/add more undocumented env vars

Author: jessebot

charts/pixelfed/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.13.0
+version: 0.14.0
 
 # This is the version number of the application being deployed.
 # renovate:image=ghcr.io/mattlqx/docker-pixelfed

charts/pixelfed/README.md

@@ -1,6 +1,6 @@
 # pixelfed
 
-![Version: 0.13.0](https://img.shields.io/badge/Version-0.13.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.12.4-nginx](https://img.shields.io/badge/AppVersion-v0.12.4--nginx-informational?style=flat-square)
+![Version: 0.14.0](https://img.shields.io/badge/Version-0.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.12.4-nginx](https://img.shields.io/badge/AppVersion-v0.12.4--nginx-informational?style=flat-square)
 
 A Helm chart for deploying Pixelfed on Kubernetes
 
@@ -74,6 +74,7 @@ A Helm chart for deploying Pixelfed on Kubernetes
 | pixelfed.account_deletion | bool | `true` | Enable account deletion (may be a requirement in some jurisdictions) |
 | pixelfed.activity_pub.enabled | bool | `false` | enable ActivityPub |
 | pixelfed.activity_pub.inbox | bool | `false` |  |
+| pixelfed.activity_pub.logger_enabled | bool | `false` |  |
 | pixelfed.activity_pub.outbox | bool | `false` |  |
 | pixelfed.activity_pub.remote_follow | bool | `false` |  |
 | pixelfed.activity_pub.sharedinbox | bool | `false` |  |
@@ -87,16 +88,28 @@ A Helm chart for deploying Pixelfed on Kubernetes
 | pixelfed.app.name | string | `"Pixelfed"` | The name of your server/instance |
 | pixelfed.app.url | string | `"https://localhost"` | change this to the domain of your pixelfed instance |
 | pixelfed.atom_feeds | string | `"true"` | https://docs.pixelfed.org/technical-documentation/config/#atom_feeds |
+| pixelfed.banned_usernames | string | `""` | not entirely sure if this is a list of banned usernames or text to display instead of banned usernames |
+| pixelfed.covid.enable_label | bool | `true` |  |
+| pixelfed.covid.label_org | string | `"visit the WHO website"` |  |
+| pixelfed.covid.label_url | string | `"https://www.who.int/emergencies/diseases/novel-coronavirus-2019/advice-for-public"` |  |
 | pixelfed.custom_emoji | bool | `false` | Enable custom emojis |
+| pixelfed.custom_emoji_max_size | int | `2000000` | max size for custom emojis, in... bytes? |
 | pixelfed.db.apply_new_migrations_automatically | bool | `false` |  |
 | pixelfed.db.connection | string | `"pgsql"` | options: sqlite mysql pgsql sqlsrv |
 | pixelfed.enable_config_cache | bool | `true` | Enable the config cache to allow you to manage settings via the admin dashboard |
 | pixelfed.enforce_email_verification | bool | `true` | Enforce email verification |
 | pixelfed.exp_emc | bool | `true` | Experimental Configuration |
+| pixelfed.exp_loops | bool | `false` | exp loops (as in loops video? 🤷 |
+| pixelfed.filesystem.cloud | string | `"s3"` | Many applications store files both locally and in the cloud. For this reason, you may specify a default “cloud” driver here. This driver will be bound as the Cloud disk implementation in the container. |
+| pixelfed.filesystem.driver | string | `"local"` |  |
 | pixelfed.force_https_urls | bool | `true` | Force https url generation |
+| pixelfed.horizon.dark_mode | bool | `false` | darkmode for the web interface in the admin panel |
+| pixelfed.horizon.prefix | string | `"horizon-"` | prefix will be used when storing all Horizon data in Redis |
+| pixelfed.image_driver | string | `"gd"` | library to process images. options: "gd" (default), "imagick" |
 | pixelfed.image_quality | int | `80` | Set the image optimization quality, between 1-100. Lower uses less space, higher more quality |
 | pixelfed.instance.contact_email | string | `""` | The public contact email for your server |
 | pixelfed.instance.contact_form | bool | `false` | enable the instance contact form |
+| pixelfed.instance.contact_max_per_day | string | `""` | instance contact max per day |
 | pixelfed.instance.cur_reg | bool | `false` | Enable Curated Registration |
 | pixelfed.instance.description | string | `"Pixelfed - Photo sharing for everyone"` | your server description |
 | pixelfed.instance.discover_public | bool | `false` | Enable public access to the Discover feature |
@@ -110,6 +123,7 @@ A Helm chart for deploying Pixelfed on Kubernetes
 | pixelfed.instance.reports.email_enabled | bool | `false` | Send a report email to the admin account for new autospam/reports |
 | pixelfed.instance.show_peers | bool | `false` | Enable the api/v1/peers API endpoint |
 | pixelfed.laravel.log_channel | string | `"stack"` | Laravel log channel. Pixelfed's default, 'stack', sends logs to the default Laravel logfile. 'stderr' allows Kubernetes to capture these logs |
+| pixelfed.laravel.log_level | string | `"debug"` | logging level |
 | pixelfed.mail.driver | string | `"smtp"` | options: "smtp" (default), "sendmail", "mailgun", "mandrill", "ses" "sparkpost", "log", "array" |
 | pixelfed.mail.encryption | string | `"tls"` | mail server encryption type |
 | pixelfed.mail.existingSecret | string | `""` | name of an existing Kubernetes Secret for mail credentials |
@@ -119,7 +133,7 @@ A Helm chart for deploying Pixelfed on Kubernetes
 | pixelfed.mail.existingSecretKeys.username | string | `""` | key in existing Kubernetes Secret for username. If set, ignores mail.username |
 | pixelfed.mail.from_address | string | `"[email protected]"` | address to use for sending emails |
 | pixelfed.mail.from_name | string | `"Pixelfed"` | name to use for sending emails |
-| pixelfed.mail.host | string | `"smtp.mailtrap.io"` |  |
+| pixelfed.mail.host | string | `"smtp.mailtrap.io"` | mail server hostname |
 | pixelfed.mail.password | string | `""` | mail server password |
 | pixelfed.mail.port | int | `2525` | mail server port |
 | pixelfed.mail.username | string | `""` | mail server username |
@@ -130,6 +144,8 @@ A Helm chart for deploying Pixelfed on Kubernetes
 | pixelfed.max_caption_length | int | `1000` | The max post caption length |
 | pixelfed.max_name_length | int | `32` | The max user display name length |
 | pixelfed.max_photo_size | int | `15000` | The max photo/video size in KB |
+| pixelfed.media_delete_local_after_cloud | bool | `true` | delete local files after saving to the cloud |
+| pixelfed.media_types | string | `"image/jpeg,image/png,image/gif"` | types of media to allow |
 | pixelfed.min_password_length | int | `16` | The min password length |
 | pixelfed.nodeinfo | string | `"true"` | https://docs.pixelfed.org/technical-documentation/config/#nodeinfo |
 | pixelfed.oauth_enabled | bool | `true` | Enable oAuth support, required for mobile/3rd party apps |

charts/pixelfed/templates/configmap_env.yaml

@@ -14,6 +14,8 @@ data:
   APP_DOMAIN: {{ . }}
   {{- end }}
 
+  EXP_LOOPS: {{ .Values.pixelfed.exp_loops }}
+
   # registration related
   OPEN_REGISTRATION: {{ .Values.pixelfed.open_registration | quote }}
   ENFORCE_EMAIL_VERIFICATION: {{ .Values.pixelfed.enforce_email_verification | quote }}
@@ -23,6 +25,8 @@ data:
 
   # not sure where to put this
   CUSTOM_EMOJI: {{ .Values.pixelfed.custom_emoji | quote }}
+  CUSTOM_EMOJI_MAX_SIZE: {{ .Values.pixelfed.custom_emoji | quote }}
+  MEDIA_TYPES: {{ .Values.pixelfed.media_types }}
 
   # limits
   MIN_PASSWORD_LENGTH: {{ .Values.pixelfed.min_password_length | quote }}
@@ -40,6 +44,7 @@ data:
   # instance config
   INSTANCE_DESCRIPTION: {{ .Values.pixelfed.instance.description | quote }}
   INSTANCE_CONTACT_FORM: {{ .Values.pixelfed.instance.contact_form | quote }}
+  INSTANCE_CONTACT_MAX_PER_DAY: {{ .Values.pixelfed.instance.contact_max_per_day | quote }}
   INSTANCE_DISCOVER_PUBLIC: {{ .Values.pixelfed.instance.discover_public | quote }}
   INSTANCE_PUBLIC_HASHTAGS: {{ .Values.pixelfed.instance.public_hashtags | quote }}
   {{- with .Values.pixelfed.instance.contact_email }}
@@ -77,14 +82,31 @@ data:
   QUEUE_DRIVER: "redis"
   BROADCAST_DRIVER: "log"
   LOG_CHANNEL: {{ .Values.pixelfed.laravel.log_channel }}
-  HORIZON_PREFIX: "horizon-"
+  LOG_LEVEL: {{ .Values.pixelfed.laravel.log_level }}
+
+  # horizon
+  HORIZON_PREFIX: {{ .Values.pixelfed.horizon.prefix | quote }}
+  HORIZON_DARKMODE: {{ .Values.pixelfed.horizon.darkmode | quote }}
+
+  # filesystem
+  FILESYSTEM_DRIVER: {{ .Values.pixelfed.filesystem.driver }}
+  FILESYSTEM_CLOUD: {{ .Values.pixelfed.filesystem.cloud }}
+  MEDIA_DELETE_LOCAL_AFTER_CLOUD: {{ .Values.pixelfed.media_delete_local_after_cloud }}
+
+  # covid
+  ENABLE_COVID_LABEL: {{ .Values.pixelfed.covid.enable_label }}
+  COVID_LABEL_URL: {{ .Values.pixelfed.covid.label_url }}
+  COVID_LABEL_ORG: {{ .Values.pixelfed.covid.label_org }}
+
+  BANNED_USERNAMES: {{ .Values.pixelfed.banned_usernames }}
 
   # activity pub
   ACTIVITY_PUB: {{ .Values.pixelfed.activity_pub.enabled | quote }}
   AP_REMOTE_FOLLOW: {{ .Values.pixelfed.activity_pub.remote_follow | quote }}
   AP_SHAREDINBOX: {{ .Values.pixelfed.activity_pub.sharedinbox | quote }}
   AP_INBOX: {{ .Values.pixelfed.activity_pub.inbox | quote }}
   AP_OUTBOX: {{ .Values.pixelfed.activity_pub.outbox | quote }}
+  AP_LOGGER_ENABLED: {{ .Values.pixelfed.activity_pub.logger_enabled | quote }}
 
   # mail
   MAIL_DRIVER: "{{ .Values.pixelfed.mail.driver }}"

charts/pixelfed/values.yaml

@@ -292,6 +292,25 @@ pixelfed:
     # -- Automatically run [artisan migrate --force] if new migrations are detected.
     apply_new_migrations_automatically: false
 
+  filesystem:
+    # -- Many applications store files both locally and in the cloud.
+    # For this reason, you may specify a default “cloud” driver here.
+    # This driver will be bound as the Cloud disk implementation in the container.
+    cloud: "s3"
+    driver: "local"
+
+  covid:
+    enable_label: true
+    label_url: "https://www.who.int/emergencies/diseases/novel-coronavirus-2019/advice-for-public"
+    label_org: "visit the WHO website"
+
+  # -- not entirely sure if this is a list of banned usernames or text to
+  # display instead of banned usernames
+  banned_usernames: ""
+
+  # -- delete local files after saving to the cloud
+  media_delete_local_after_cloud: true
+
   # -- timezone for docker container
   timezone: "europe/amsterdam"
 
@@ -307,6 +326,13 @@ pixelfed:
   # -- trusted proxies
   trusted_proxies: "*"
 
+  # horizon - for interfacing with redis
+  horizon:
+    # -- prefix will be used when storing all Horizon data in Redis
+    prefix: "horizon-"
+    # -- darkmode for the web interface in the admin panel
+    dark_mode: false
+
   # app specific settings
   app:
     # -- This key is used by the Illuminate encrypter service and should
@@ -335,6 +361,8 @@ pixelfed:
   laravel:
     # -- Laravel log channel. Pixelfed's default, 'stack', sends logs to the default Laravel logfile. 'stderr' allows Kubernetes to capture these logs
     log_channel: stack
+    # -- logging level
+    log_level: "debug"
 
   # -- Enable open registration for new accounts
   open_registration: true
@@ -357,6 +385,12 @@ pixelfed:
   # -- Enable custom emojis
   custom_emoji: false
 
+  # -- max size for custom emojis, in... bytes?
+  custom_emoji_max_size: 2000000
+
+  # -- types of media to allow
+  media_types: "image/jpeg,image/png,image/gif"
+
   # -- Enable the config cache to allow you to manage settings via the admin dashboard
   enable_config_cache: true
 
@@ -387,18 +421,26 @@ pixelfed:
   # -- Force https url generation
   force_https_urls: true
 
+  # -- exp loops (as in loops video? 🤷
+  exp_loops: false
+
+  # -- library to process images. options: "gd" (default), "imagick"
+  image_driver: "gd"
+
   # your whole instance, or server, settings
   instance:
     # -- your server description
     description: "Pixelfed - Photo sharing for everyone"
-    # -- enable the instance contact form
-    contact_form: false
     # -- Enable public access to the Discover feature
     discover_public: false
     # -- Allow anonymous access to hashtag feeds
     public_hashtags: false
+    # -- enable the instance contact form
+    contact_form: false
     # -- The public contact email for your server
     contact_email: ""
+    # -- instance contact max per day
+    contact_max_per_day: ""
     # -- Enable the profile embed feature
     profile_embeds: true
     # -- Enable the post embed feature
@@ -457,6 +499,8 @@ pixelfed:
     inbox: false
     outbox: false
     sharedinbox: false
+    # activity pub logger?
+    logger_enabled: false
 
   ###########################################################
   # Federation
@@ -475,6 +519,7 @@ pixelfed:
     # -- options: "smtp" (default), "sendmail", "mailgun", "mandrill", "ses"
     # "sparkpost", "log", "array"
     driver: smtp
+    # -- mail server hostname
     host: smtp.mailtrap.io
     # -- mail server port
     port: 2525
@@ -491,6 +536,7 @@ pixelfed:
 
     # -- name of an existing Kubernetes Secret for mail credentials
     existingSecret: ""
+    # keys in existing secret
     existingSecretKeys:
       # --  key in existing Kubernetes Secret for host. If set, ignores mail.host
       host: ""