@geekity/cms 0.30.0 → 0.32.0

package/admin/pages/navigation/menus.njk

@@ -49,7 +49,7 @@
           types you want on it.
         {% endset %}
         {{ field.textarea('menu-' + menu.name, fields.items, 'Items', menu.items,
-             error=menu.problem, hint=itemsHint, rows='5', spellcheck='false') }}
+             error=menu.problem, hintHtml=itemsHint, rows='5', spellcheck='false') }}
         <div class="mt-2">{{ button('Save menu', type='submit', color='primary') }}</div>
       </form>
 
@@ -134,7 +134,7 @@
           theme that will use it.
         {% endset %}
         {{ field.text('menu-name', fields.name, 'Name', newName,
-             error=nameProblem, hint=nameHint, spellcheck='false', required=true) }}
+             error=nameProblem, hintHtml=nameHint, spellcheck='false', required=true) }}
         <div class="mt-2">{{ button('Add menu', type='submit', color='primary') }}</div>
       </form>
     {% endcall %}

package/admin/pages/plugins/screen.njk

@@ -1,14 +1,9 @@
 {# /admin/plugins/<package name>: a plugin's own screen (decision-33). The
    plugin hands over cards of paragraphs and tables as data and this draws
-   them, so a plugin writes no markup and everything it says is escaped.
-
-   A plugin with settings gets a form here too (TASK-283). A label or hint
-   from a plugin is escaped before the field macros, which print theirs as
-   markup. A secret is never printed: the form says whether it is set and
-   where, and names the environment variable that would set it. #}
+   them, so a plugin writes no markup and everything it says is escaped. #}
 {% extends "layouts/shell.njk" %}
 {% import "components/fields.njk" as field %}
-{% from "components/badge.njk" import status %}
+{% from "components/setting-fields.njk" import settingFields %}
 {% from "components/button.njk" import button %}
 {% from "components/card.njk" import card, cardActions %}
 {% from "components/table.njk" import table %}
@@ -37,42 +32,7 @@
           <form method="post" action="{{ postUrl }}">
             <input type="hidden" name="csrf_token" value="{{ csrfToken }}" />
             <input type="hidden" name="{{ actionField }}" value="{{ saveAction }}" />
-            {% for setting in settings %}
-              {% set label = setting.label | escape %}
-              {% set error = setting.error or setting.stored %}
-              {% if setting.type == 'secret' %}
-                {% set hint %}{% if setting.hint %}{{ setting.hint }} {% endif %}{% if setting.source == 'environment' %}Set by the environment variable <code>{{ setting.variable }}</code>. Change it there.{% elif setting.source == 'file' %}Set in <code>{{ secretsFile }}</code>. Leave the box blank to keep it. The environment variable <code>{{ setting.variable }}</code> would win over it.{% else %}Not set. Or set the environment variable <code>{{ setting.variable }}</code>.{% endif %}{% endset %}
-                {% if setting.source == 'environment' %}
-                  <div class="fieldset">
-                    <p class="fieldset-legend">{{ label }} {{ status('connected', 'Set') }}</p>
-                    <p class="label block whitespace-normal">{{ hint | safe }}</p>
-                  </div>
-                {% else %}
-                  {{ field.password(setting.id, setting.name,
-                       label ~ ' ' ~ (status('connected', 'Set') if setting.source == 'file' else status('missing', 'Not set')),
-                       hint=hint, error=setting.error, autocomplete='off', spellcheck='false',
-                       placeholder=('Leave blank to keep it' if setting.source == 'file' else '')) }}
-                  {% if setting.source == 'file' %}
-                    {{ field.checkbox(setting.id ~ '-forget', setting.forgetName, 'Forget the stored ' ~ label) }}
-                  {% endif %}
-                {% endif %}
-              {% else %}
-                {% set hint %}{{ setting.hint }}{% endset %}
-                {% if setting.type == 'checkbox' %}
-                  {{ field.checkbox(setting.id, setting.name, label, checked=setting.checked,
-                       hint=hint, error=error) }}
-                {% elif setting.type == 'select' %}
-                  {% call field.select(setting.id, setting.name, label, hint=hint, error=error) %}
-                    {% for option in setting.options %}
-                      <option value="{{ option.value }}"{% if option.selected %} selected{% endif %}>{{ option.label }}</option>
-                    {% endfor %}
-                  {% endcall %}
-                {% else %}
-                  {{ field.text(setting.id, setting.name, label, setting.value, hint=hint, error=error,
-                       inputmode=('url' if setting.type == 'url' else ''), spellcheck='false') }}
-                {% endif %}
-              {% endif %}
-            {% endfor %}
+            {{ settingFields(settings, secretsFile) }}
             <div class="mt-2">{{ button('Save settings', type='submit', color='primary') }}</div>
           </form>
         {% endif %}
@@ -87,9 +47,8 @@
 
         {% if settings.length %}
           <p class="text-sm">
-            Settings other than secrets are kept under this plugin's key in
-            <code>content/_data/site.json</code>. Secrets are kept in
-            <code>{{ secretsFile }}</code> at mode <code>0600</code> and are never shown here.
+            Settings other than secrets are kept in <code>{{ settingsFile }}</code>. Secrets are
+            kept in <code>{{ secretsFile }}</code> at mode <code>0600</code> and are never shown here.
           </p>
         {% endif %}
       {% endcall %}

package/admin/pages/settings/discussion.njk

@@ -17,32 +17,47 @@
 {% endmacro %}
 
 {% block settingsProblems %}
-  {{ field.problem('settings-comments-close', problems.commentsCloseAfterDays) }}
-  {{ field.problem('settings-comment-email-retention', problems.commentEmailRetentionDays) }}
-  {{ field.problem('settings-address-hash-retention', problems.addressHashRetentionDays) }}
-  {{ field.problem('settings-contact-message-retention', problems.contactMessageRetentionDays) }}
+  {{ field.problem('settings-comments-close', problems.comments_close_after_days) }}
+  {{ field.problem('settings-comment-email-retention', problems.comment_email_retention_days) }}
+  {{ field.problem('settings-address-hash-retention', problems.address_hash_retention_days) }}
+  {{ field.problem('settings-contact-message-retention', problems.contact_message_retention_days) }}
 {% endblock %}
 
 {% block settingsFields %}
   <h2 class="mt-2 text-lg font-semibold">Comments</h2>
 
   {% set commentsHint %}
-    Clear this and no post shows a comment form and every submission is
-    refused. Fediverse replies keep arriving and keep being shown either way:
+    Clear this and nothing shows a comment form and every submission is
+    refused. What was already said stays under its post or page. Fediverse replies keep arriving and keep being shown either way:
     a remote server sends those, and nothing here can stop it.
   {% endset %}
   {{ field.checkbox('settings-comments', fields.comments, 'Take comments on this site',
-       checked=form.comments, hint=commentsHint) }}
+       checked=form.comments, hintHtml=commentsHint) }}
+
+  <fieldset class="fieldset">
+    <legend class="fieldset-legend">Take comments by default on</legend>
+    {{ field.checkbox('settings-comments-on-posts', fields.comments_on_posts, 'Posts',
+         checked=form.comments_on_posts) }}
+    {{ field.checkbox('settings-comments-on-pages', fields.comments_on_pages, 'Pages',
+         checked=form.comments_on_pages) }}
+    <p class="label block whitespace-normal">
+      What a document left on "Follow the site settings" in the editor does. A
+      document set to Open or Closed there, which writes
+      <code>comments: true</code> or <code>comments: false</code> into its
+      front matter, overrides this in both directions. Drafts take none, and
+      nothing reopens a site with comments switched off above.
+    </p>
+  </fieldset>
 
   {% set closeHint %}
-    Days after a post's date that it stops taking comments; <code>0</code>
-    never closes one. A post overrides this for itself with
-    <code>comments: true</code> or <code>comments: false</code>, which the
-    editor offers as a field. Pages are closed unless they say otherwise.
+    Days after a document's date that it stops taking comments, for posts and
+    pages alike; <code>0</code> never closes one. A document with no date,
+    which most pages are, never closes, and one set to Open in the editor
+    ignores the window.
   {% endset %}
-  {{ field.text('settings-comments-close', fields.commentsCloseAfterDays, 'Close comments after',
-       form.commentsCloseAfterDays, type='number', min='0', step='1',
-       error=problems.commentsCloseAfterDays, hint=closeHint) }}
+  {{ field.text('settings-comments-close', fields.comments_close_after_days, 'Close comments after',
+       form.comments_close_after_days, type='number', min='0', step='1',
+       error=problems.comments_close_after_days, hintHtml=closeHint) }}
 
   <h2 class="mt-6 text-lg font-semibold">Webmentions</h2>
 
@@ -51,8 +66,8 @@
     asked whether it takes webmentions and told about the post if it does.
     The Resend button on the federation screen sends them again.
   {% endset %}
-  {{ field.checkbox('settings-webmentions-send', fields.webmentionsSend,
-       'Tell the pages a post links to', checked=form.webmentionsSend, hint=sendHint) }}
+  {{ field.checkbox('settings-webmentions-send', fields.webmentions_send,
+       'Tell the pages a post links to', checked=form.webmentions_send, hintHtml=sendHint) }}
 
   {% set receiveHint %}
     Every post advertises an endpoint, and a page that links to one and says
@@ -60,8 +75,8 @@
     is gone from the pages and answers nothing; what has already arrived
     stays where it is.
   {% endset %}
-  {{ field.checkbox('settings-webmentions-receive', fields.webmentionsReceive,
-       'Accept webmentions sent here', checked=form.webmentionsReceive, hint=receiveHint) }}
+  {{ field.checkbox('settings-webmentions-receive', fields.webmentions_receive,
+       'Accept webmentions sent here', checked=form.webmentions_receive, hintHtml=receiveHint) }}
 
   <h2 class="mt-6 text-lg font-semibold">Keeping personal data</h2>
 
@@ -76,40 +91,41 @@
   </p>
 
   {% set emailHint %}
-    {{ retention(form.commentEmailRetentionDays) }}
+    {{ retention(form.comment_email_retention_days) }}
     Past this a comment loses its author's email. The comment, its place in
     the thread and its moderation status stay; the author is no longer told
     about replies, and their next comment waits for a moderator. Recommended:
     <code>180</code>.
   {% endset %}
-  {{ field.text('settings-comment-email-retention', fields.commentEmailRetentionDays,
-       'Keep commenter emails for', form.commentEmailRetentionDays, type='number', min='0',
-       step='1', error=problems.commentEmailRetentionDays, hint=emailHint) }}
+  {{ field.text('settings-comment-email-retention', fields.comment_email_retention_days,
+       'Keep commenter emails for', form.comment_email_retention_days, type='number', min='0',
+       step='1', error=problems.comment_email_retention_days, hintHtml=emailHint) }}
 
   {% set hashHint %}
-    {{ retention(form.addressHashRetentionDays) }}
+    {{ retention(form.address_hash_retention_days) }}
     The salted hash of the address a comment, webmention or contact message
     came from, which shows a moderator that two came from one place.
     Recommended: <code>30</code>.
   {% endset %}
-  {{ field.text('settings-address-hash-retention', fields.addressHashRetentionDays,
-       'Keep address hashes for', form.addressHashRetentionDays, type='number', min='0',
-       step='1', error=problems.addressHashRetentionDays, hint=hashHint) }}
+  {{ field.text('settings-address-hash-retention', fields.address_hash_retention_days,
+       'Keep address hashes for', form.address_hash_retention_days, type='number', min='0',
+       step='1', error=problems.address_hash_retention_days, hintHtml=hashHint) }}
 
   {% set contactHint %}
-    {{ retention(form.contactMessageRetentionDays) }}
+    {{ retention(form.contact_message_retention_days) }}
     Past this a contact message is deleted from the Messages screen and from
     <code>data/contact/</code>. Recommended: <code>365</code>.
   {% endset %}
-  {{ field.text('settings-contact-message-retention', fields.contactMessageRetentionDays,
-       'Keep contact messages for', form.contactMessageRetentionDays, type='number', min='0',
-       step='1', error=problems.contactMessageRetentionDays, hint=contactHint) }}
+  {{ field.text('settings-contact-message-retention', fields.contact_message_retention_days,
+       'Keep contact messages for', form.contact_message_retention_days, type='number', min='0',
+       step='1', error=problems.contact_message_retention_days, hintHtml=contactHint) }}
 {% endblock %}
 
 {% block settingsPanels %}
   {# Akismet is its own pair of forms for the reason the avatar is: the key is
-     a credential in data/akismet.json rather than a setting in site.json, and
-     a key Akismet will not take must not lose an edit to the fields above. #}
+     the secret akismet.key setting in data/akismet.json rather than a setting
+     in site.json, and a key Akismet will not take must not lose an edit to the
+     fields above. #}
   {% call card(title='Spam checking') %}
     <p>
       {% if akismetState == 'valid' %}
@@ -124,30 +140,43 @@
     </p>
     <p class="text-sm">{{ akismetHint }}</p>
 
-    <form method="post" action="{{ akismetUrl }}">
-      <input type="hidden" name="csrf_token" value="{{ csrfToken }}" />
-      {% if akismetPresent %}
-        {% set akismetPlaceholder = 'Replace the stored key' %}
-      {% else %}
-        {% set akismetPlaceholder = 'Paste your key' %}
-      {% endif %}
-      {{ field.password('settings-akismet-key', akismetFields.key, 'Akismet API key',
-           autocomplete='off', spellcheck='false', placeholder=akismetPlaceholder) }}
-      <div class="mt-2">
-        {{ button('Replace key' if akismetPresent else 'Save key', type='submit', color='primary') }}
-      </div>
-    </form>
+    {% if akismetSetBy %}
+      <p class="text-sm">The key is set by <code>{{ akismetSetBy }}</code> and cannot be changed here.</p>
+    {% else %}
+      <form method="post" action="{{ akismetUrl }}">
+        <input type="hidden" name="csrf_token" value="{{ csrfToken }}" />
+        {% if akismetPresent %}
+          {% set akismetPlaceholder = 'Replace the stored key' %}
+        {% else %}
+          {% set akismetPlaceholder = 'Paste your key' %}
+        {% endif %}
+        {{ field.password('settings-akismet-key', akismetFields.key, 'Akismet API key',
+             autocomplete='off', spellcheck='false', placeholder=akismetPlaceholder) }}
+        <div class="mt-2">
+          {{ button('Replace key' if akismetPresent else 'Save key', type='submit', color='primary') }}
+        </div>
+      </form>
+    {% endif %}
+
+    {% if akismetPresent %}
+      <form method="post" action="{{ akismetUrl }}">
+        <input type="hidden" name="csrf_token" value="{{ csrfToken }}" />
+        <input type="hidden" name="{{ akismetFields.action }}" value="{{ akismetVerify }}" />
+        <div class="mt-2">{{ button('Check key with Akismet', type='submit') }}</div>
+      </form>
+    {% endif %}
 
     <p class="text-sm">
       A key from <a class="link" href="https://akismet.com/">akismet.com</a> turns on spam
       checking for native comments and incoming webmentions. It is checked with
       Akismet when it is saved and kept in <code>data/akismet.json</code>, never
-      in <code>site.json</code> and never on the public site. Marking something
+      in <code>site.json</code> and never on the public site. A deployment can
+      set it instead with <code>GEEKITY_AKISMET__KEY</code>. Marking something
       spam or not spam on the Comments screen tells Akismet, which is the only
       way it learns. Fediverse replies are never sent to it.
     </p>
 
-    {% if akismetPresent %}
+    {% if akismetPresent and not akismetSetBy %}
       <form method="post" action="{{ akismetUrl }}">
         <input type="hidden" name="csrf_token" value="{{ csrfToken }}" />
         <input type="hidden" name="{{ akismetFields.action }}" value="{{ akismetRemove }}" />

package/admin/pages/settings/email.njk

@@ -7,13 +7,13 @@
 {% from "components/card.njk" import card, cardActions %}
 
 {% block settingsProblems %}
-  {{ field.problem('settings-mail-provider', problems.mailProvider) }}
-  {{ field.problem('settings-mail-from-address', problems.mailFromAddress) }}
-  {{ field.problem('settings-mail-reply-to', problems.mailReplyTo) }}
-  {{ field.problem('settings-contact-email', problems.contactEmail) }}
-  {{ field.problem('settings-security-contacts', problems.securityContacts) }}
-  {{ field.problem('settings-security-policy', problems.securityPolicy) }}
-  {{ field.problem('settings-security-languages', problems.securityLanguages) }}
+  {{ field.problem('settings-mail-provider', problems.mail_provider) }}
+  {{ field.problem('settings-mail-from-address', problems.mail_from_address) }}
+  {{ field.problem('settings-mail-reply-to', problems.mail_reply_to) }}
+  {{ field.problem('settings-contact-email', problems.contact_email) }}
+  {{ field.problem('settings-security-contacts', problems.security_contacts) }}
+  {{ field.problem('settings-security-policy', problems.security_policy) }}
+  {{ field.problem('settings-security-languages', problems.security_languages) }}
 {% endblock %}
 
 {% block settingsFields %}
@@ -21,28 +21,28 @@
     The key or password each one needs is a credential and is saved below,
     in <code>data/mail.json</code> rather than in <code>site.json</code>.
   {% endset %}
-  {% call field.select('settings-mail-provider', fields.mailProvider, 'Provider',
-       error=problems.mailProvider, hint=providerHint) %}
+  {% call field.select('settings-mail-provider', fields.mail_provider, 'Provider',
+       error=problems.mail_provider, hintHtml=providerHint) %}
     {% for provider in mailProviders %}
-      <option value="{{ provider }}"{% if form.mailProvider == provider %} selected{% endif %}>
+      <option value="{{ provider }}"{% if form.mail_provider == provider %} selected{% endif %}>
         {% if provider == 'none' %}None &mdash; this site sends no email{% elif provider == 'brevo' %}Brevo (transactional API){% else %}SMTP{% endif %}
       </option>
     {% endfor %}
   {% endcall %}
 
-  {{ field.text('settings-mail-from-name', fields.mailFromName, 'From name', form.mailFromName,
+  {{ field.text('settings-mail-from-name', fields.mail_from_name, 'From name', form.mail_from_name,
        hint='The name on the From line. Empty uses the site title.') }}
 
   {% set fromAddressHint %}
     Providers only send from an address they have verified, so this should be
     one you own. Empty falls back to <code>no-reply@</code> at the site's host.
   {% endset %}
-  {{ field.text('settings-mail-from-address', fields.mailFromAddress, 'From address',
-       form.mailFromAddress, error=problems.mailFromAddress, hint=fromAddressHint,
+  {{ field.text('settings-mail-from-address', fields.mail_from_address, 'From address',
+       form.mail_from_address, error=problems.mail_from_address, hintHtml=fromAddressHint,
        inputmode='email') }}
 
-  {{ field.text('settings-mail-reply-to', fields.mailReplyTo, 'Reply-to', form.mailReplyTo,
-       error=problems.mailReplyTo, inputmode='email',
+  {{ field.text('settings-mail-reply-to', fields.mail_reply_to, 'Reply-to', form.mail_reply_to,
+       error=problems.mail_reply_to, inputmode='email',
        hint='Where a reply goes. Empty replies to the From address.') }}
 
   {% set contactHint %}
@@ -50,8 +50,8 @@
     wrote it. Empty writes to the first admin with an email address. It is read when a
     message arrives and never appears on the public site.
   {% endset %}
-  {{ field.text('settings-contact-email', fields.contactEmail, 'Contact address',
-       form.contactEmail, error=problems.contactEmail, hint=contactHint, inputmode='email') }}
+  {{ field.text('settings-contact-email', fields.contact_email, 'Contact address',
+       form.contact_email, error=problems.contact_email, hintHtml=contactHint, inputmode='email') }}
 
   <h2 class="mt-6 text-lg font-semibold">Security contact</h2>
 
@@ -61,24 +61,24 @@
     published at <a href="/.well-known/security.txt"><code>/.well-known/security.txt</code></a>,
     which is not served at all while this is empty.
   {% endset %}
-  {{ field.textarea('settings-security-contacts', fields.securityContacts, 'Contacts',
-       form.securityContacts, error=problems.securityContacts, hint=securityContactsHint,
+  {{ field.textarea('settings-security-contacts', fields.security_contacts, 'Contacts',
+       form.security_contacts, error=problems.security_contacts, hintHtml=securityContactsHint,
        rows='2', spellcheck='false') }}
 
-  {{ field.text('settings-security-policy', fields.securityPolicy, 'Disclosure policy',
-       form.securityPolicy, error=problems.securityPolicy, inputmode='url',
+  {{ field.text('settings-security-policy', fields.security_policy, 'Disclosure policy',
+       form.security_policy, error=problems.security_policy, inputmode='url',
        hint='Optional. An https:// URL for the page that says how reports are handled.') }}
 
-  {{ field.text('settings-security-languages', fields.securityLanguages, 'Preferred languages',
-       form.securityLanguages, error=problems.securityLanguages,
+  {{ field.text('settings-security-languages', fields.security_languages, 'Preferred languages',
+       form.security_languages, error=problems.security_languages,
        hint='Optional. The languages a report may be written in, such as en, fr.') }}
 {% endblock %}
 
 {% block settingsPanels %}
   {# The mail credential is its own pair of forms for the reason the Akismet
-     key is: an API key and an SMTP password belong in data/mail.json, not in
-     the public site.json, and a mistyped one must not lose an edit to the
-     From line. #}
+     key is: an API key and an SMTP password are the mail settings, kept in
+     data/mail.json, not in the public site.json, and a mistyped one must not
+     lose an edit to the From line. #}
   {% call card(title='Mail credentials') %}
 
     <p>
@@ -125,40 +125,64 @@
 
         {% if mailProvider == 'brevo' %}
           <h3 class="font-semibold">Brevo</h3>
-          {% if mailBrevoPresent %}
-            <p class="text-sm">A key is stored, ending {{ mailBrevoKeyHint }}.</p>
-            {% set brevoPlaceholder = 'Leave blank to keep the stored key' %}
+          {% if mailSetBy.brevo_api_key %}
+            <p class="text-sm">The API key is set by <code>{{ mailSetBy.brevo_api_key }}</code> and cannot be changed here.</p>
           {% else %}
-            {% set brevoPlaceholder = 'Paste your key' %}
+            {% if mailBrevoPresent %}
+              <p class="text-sm">A key is stored, ending {{ mailBrevoKeyHint }}.</p>
+              {% set brevoPlaceholder = 'Leave blank to keep the stored key' %}
+            {% else %}
+              {% set brevoPlaceholder = 'Paste your key' %}
+            {% endif %}
+            {{ field.password('settings-mail-brevo-key', mailFields.brevoApiKey, 'API key',
+                 autocomplete='off', spellcheck='false', placeholder=brevoPlaceholder) }}
           {% endif %}
-          {{ field.password('settings-mail-brevo-key', mailFields.brevoApiKey, 'API key',
-               autocomplete='off', spellcheck='false', placeholder=brevoPlaceholder) }}
         {% else %}
           <h3 class="font-semibold">SMTP</h3>
-          {{ field.text('settings-mail-smtp-host', mailFields.smtpHost, 'Host', mailSmtp.host,
-               autocomplete='off') }}
+          {% if mailSetBy.smtp_host %}
+            <p class="text-sm">Host {{ mailSmtp.host }}, set by <code>{{ mailSetBy.smtp_host }}</code>.</p>
+          {% else %}
+            {{ field.text('settings-mail-smtp-host', mailFields.smtpHost, 'Host', mailSmtp.host,
+                 autocomplete='off') }}
+          {% endif %}
 
-          {{ field.text('settings-mail-smtp-port', mailFields.smtpPort, 'Port',
-               mailSmtp.port if mailSmtp else 587, inputmode='numeric') }}
+          {% if mailSetBy.smtp_port %}
+            <p class="text-sm">Port {{ mailSmtp.port }}, set by <code>{{ mailSetBy.smtp_port }}</code>.</p>
+          {% else %}
+            {{ field.text('settings-mail-smtp-port', mailFields.smtpPort, 'Port',
+                 mailSmtp.port if mailSmtp else 587, inputmode='numeric') }}
+          {% endif %}
 
           {# Its own box with the sentence beside it, like every other switch in
              the admin. It used to be a label wrapped round the tick in a class the
              stylesheet has never heard of, so it was the one switch here that
              rendered unstyled. #}
-          {{ field.checkbox('settings-mail-smtp-secure', mailFields.smtpSecure,
-               'TLS from the first byte (port 465)', checked=mailSmtp.secure,
-               hint='Leave this off for port 587, which upgrades with STARTTLS.') }}
+          {% if mailSetBy.smtp_secure %}
+            <p class="text-sm">TLS from the first byte {{ 'on' if mailSmtp.secure else 'off' }}, set by <code>{{ mailSetBy.smtp_secure }}</code>.</p>
+          {% else %}
+            {{ field.checkbox('settings-mail-smtp-secure', mailFields.smtpSecure,
+                 'TLS from the first byte (port 465)', checked=mailSmtp.secure,
+                 hint='Leave this off for port 587, which upgrades with STARTTLS.') }}
+          {% endif %}
 
-          {{ field.text('settings-mail-smtp-user', mailFields.smtpUser, 'Username', mailSmtp.user,
-               autocomplete='off') }}
+          {% if mailSetBy.smtp_user %}
+            <p class="text-sm">Username {{ mailSmtp.user }}, set by <code>{{ mailSetBy.smtp_user }}</code>.</p>
+          {% else %}
+            {{ field.text('settings-mail-smtp-user', mailFields.smtpUser, 'Username', mailSmtp.user,
+                 autocomplete='off') }}
+          {% endif %}
 
-          {% if mailSmtp.hasPassword %}
-            {% set smtpPlaceholder = 'Leave blank to keep the stored password' %}
+          {% if mailSetBy.smtp_password %}
+            <p class="text-sm">The password is set by <code>{{ mailSetBy.smtp_password }}</code> and cannot be changed here.</p>
           {% else %}
-            {% set smtpPlaceholder = 'The SMTP password' %}
+            {% if mailSmtp.hasPassword %}
+              {% set smtpPlaceholder = 'Leave blank to keep the stored password' %}
+            {% else %}
+              {% set smtpPlaceholder = 'The SMTP password' %}
+            {% endif %}
+            {{ field.password('settings-mail-smtp-password', mailFields.smtpPassword, 'Password',
+                 autocomplete='off', spellcheck='false', placeholder=smtpPlaceholder) }}
           {% endif %}
-          {{ field.password('settings-mail-smtp-password', mailFields.smtpPassword, 'Password',
-               autocomplete='off', spellcheck='false', placeholder=smtpPlaceholder) }}
         {% endif %}
 
         <div class="mt-2">{{ button('Save credentials', type='submit', color='primary') }}</div>
@@ -225,7 +249,11 @@
       page. Both are kept in <code>data/mail.json</code> at mode
       <code>0600</code>, beside the password hashes and the actor's private
       keys, and never in <code>site.json</code>, which is public and in git.
-      Leaving a secret blank keeps the one already stored.
+      Leaving a secret blank keeps the one already stored. A deployment can set
+      any of them instead with <code>GEEKITY_MAIL__BREVO_API_KEY</code>,
+      <code>GEEKITY_MAIL__SMTP_PASSWORD</code> and the other
+      <code>GEEKITY_MAIL__*</code> variables, and then this page shows what sets
+      them.
     </p>
   {% endcall %}
 {% endblock %}

package/admin/pages/settings/general.njk

@@ -4,14 +4,14 @@
 
 {% block settingsProblems %}
   {{ field.problem('settings-title', problems.title) }}
-  {{ field.problem('settings-base-url', problems.baseUrl) }}
+  {{ field.problem('settings-base-url', problems.base_url) }}
   {{ field.problem('settings-timezone', problems.timezone) }}
   {{ field.problem('settings-language', problems.language) }}
   {{ field.problem('settings-locale', problems.locale) }}
   {{ field.problem('settings-icon', problems.icon) }}
   {{ field.problem('settings-license', problems.license) }}
-  {{ field.problem('settings-license-url', problems.licenseUrl) }}
-  {{ field.problem('settings-license-name', problems.licenseName) }}
+  {{ field.problem('settings-license-url', problems.license_url) }}
+  {{ field.problem('settings-license-name', problems.license_name) }}
 {% endblock %}
 
 {% block settingsFields %}
@@ -22,7 +22,7 @@
        hint='One line, shown under the title and used as the feed subtitle.') }}
 
   {% set authorHint %}A user makes this their blog: the homepage shows their bio and links, claims their author archive and profiles with <code>rel="me"</code>, and is their IndieAuth sign-in URL. The feeds and the footer credit them by name. Several authors credits the site title instead.{% endset %}
-  {% call field.select('settings-author', fields.author, 'Site author', hint=authorHint) %}
+  {% call field.select('settings-author', fields.author, 'Site author', hintHtml=authorHint) %}
     <option value=""{% if not form.author %} selected{% endif %}>Several authors</option>
     {% for choice in authorChoices %}
       <option value="{{ choice.username }}"{% if choice.username == form.author %} selected{% endif %}>{{ choice.name }}</option>
@@ -30,25 +30,25 @@
   {% endcall %}
 
   {% set baseUrlHint %}In effect: <code>{{ baseUrlInEffect }}</code>. {{ baseUrlNote }}{% endset %}
-  {{ field.text('settings-base-url', fields.baseUrl, 'Base URL', form.baseUrl,
-       error=problems.baseUrl, hint=baseUrlHint, inputmode='url',
+  {{ field.text('settings-base-url', fields.base_url, 'Base URL', form.base_url,
+       error=problems.base_url, hintHtml=baseUrlHint, inputmode='url',
        readonly=baseUrlOverridden, disabled=baseUrlOverridden) }}
 
   {% set timezoneHint %}An IANA name, such as <code>Europe/London</code> or <code>UTC</code>.{% endset %}
   {{ field.text('settings-timezone', fields.timezone, 'Time zone', form.timezone,
-       error=problems.timezone, hint=timezoneHint, required=true) }}
+       error=problems.timezone, hintHtml=timezoneHint, required=true) }}
 
   {% set languageHint %}A BCP 47 tag, such as <code>en</code> or <code>en-GB</code>. It is the page's <code>lang</code> and the feeds' language.{% endset %}
   {{ field.text('settings-language', fields.language, 'Language', form.language,
-       error=problems.language, hint=languageHint, required=true) }}
+       error=problems.language, hintHtml=languageHint, required=true) }}
 
   {% set localeHint %}How the public site writes dates and counts, such as <code>en-US</code> for <code>September 2, 2026</code>. Leave it empty to follow the language.{% endset %}
   {{ field.text('settings-locale', fields.locale, 'Locale', form.locale,
-       error=problems.locale, hint=localeHint) }}
+       error=problems.locale, hintHtml=localeHint) }}
 
   {% set iconHint %}A square image at least 512 pixels wide, uploaded on <a href="{{ adminUrl }}/media">Media</a>: a path such as <code>/uploads/2026/10/icon.png</code>. It is the favicon, the home screen icon, <code>/favicon.ico</code> and the web app manifest's icon. Anything not square is cropped to its middle.{% endset %}
   {{ field.text('settings-icon', fields.icon, 'Site icon', form.icon,
-       error=problems.icon, hint=iconHint) }}
+       error=problems.icon, hintHtml=iconHint) }}
 
   <div class="flex items-center gap-4">
     {% if iconPreview %}
@@ -78,7 +78,7 @@
   </div>
 
   {% set licenseHint %}What readers may do with your posts. The footer links it, and the structured data and the feeds declare it. A post can name its own with <code>license</code> in its front matter.{% endset %}
-  {% call field.select('settings-license', fields.license, 'License', error=problems.license, hint=licenseHint) %}
+  {% call field.select('settings-license', fields.license, 'License', error=problems.license, hintHtml=licenseHint) %}
     <option value=""{% if not form.license %} selected{% endif %}>No license (all rights reserved)</option>
     {% for choice in licenseChoices %}
       <option value="{{ choice.key }}"{% if choice.key == form.license %} selected{% endif %}>{{ choice.name }}</option>
@@ -86,11 +86,11 @@
     <option value="custom"{% if form.license == 'custom' %} selected{% endif %}>Custom license</option>
   {% endcall %}
 
-  {{ field.text('settings-license-url', fields.licenseUrl, 'Custom license URL', form.licenseUrl,
-       error=problems.licenseUrl, inputmode='url', hint='Where its terms are. Only read for a custom license.') }}
+  {{ field.text('settings-license-url', fields.license_url, 'Custom license URL', form.license_url,
+       error=problems.license_url, inputmode='url', hint='Where its terms are. Only read for a custom license.') }}
 
-  {{ field.text('settings-license-name', fields.licenseName, 'Custom license name', form.licenseName,
-       error=problems.licenseName, hint='What the footer calls it. Only read for a custom license.') }}
+  {{ field.text('settings-license-name', fields.license_name, 'Custom license name', form.license_name,
+       error=problems.license_name, hint='What the footer calls it. Only read for a custom license.') }}
 {% endblock %}
 
 {% block settingsPanels %}{% endblock %}

package/admin/pages/settings/permalinks.njk

@@ -6,18 +6,18 @@
 {% from "components/table.njk" import table %}
 
 {% block settingsProblems %}
-  {{ field.problem('settings-tag-base', problems.tagBase) }}
-  {{ field.problem('settings-category-base', problems.categoryBase) }}
+  {{ field.problem('settings-tag-base', problems.tag_base) }}
+  {{ field.problem('settings-category-base', problems.category_base) }}
 {% endblock %}
 
 {% block settingsFields %}
-  {% set tagBaseHint %}The tag archives live at <code>/{{ form.tagBase }}/{tag}/</code>. One path segment, no slashes.{% endset %}
-  {{ field.text('settings-tag-base', fields.tagBase, 'Tag base', form.tagBase,
-       error=problems.tagBase, hint=tagBaseHint, required=true, autofocus=true) }}
+  {% set tagBaseHint %}The tag archives live at <code>/{{ form.tag_base }}/{tag}/</code>. One path segment, no slashes.{% endset %}
+  {{ field.text('settings-tag-base', fields.tag_base, 'Tag base', form.tag_base,
+       error=problems.tag_base, hintHtml=tagBaseHint, required=true, autofocus=true) }}
 
-  {% set categoryBaseHint %}The category archives live at <code>/{{ form.categoryBase }}/{name}/</code>.{% endset %}
-  {{ field.text('settings-category-base', fields.categoryBase, 'Category base', form.categoryBase,
-       error=problems.categoryBase, hint=categoryBaseHint, required=true) }}
+  {% set categoryBaseHint %}The category archives live at <code>/{{ form.category_base }}/{name}/</code>.{% endset %}
+  {{ field.text('settings-category-base', fields.category_base, 'Category base', form.category_base,
+       error=problems.category_base, hintHtml=categoryBaseHint, required=true) }}
 {% endblock %}
 
 {% block settingsPanels %}