Compare commits

...
Author SHA1 Message Date
gov 98121c0195 docs: instructions for enrolling a passkey
Deploy PDS / deploy (push) Canceled after 0s
2026-09-20 18:48:19 -04:00
gov c6122b9507 fix: host mapping for pds operator to make reqs outside docker
Deploy PDS / deploy (push) Canceled after 0s
2026-09-20 18:40:01 -04:00
gov fa3de78336 fix: less opinionated pds operator hostname
Deploy PDS / deploy (push) Canceled after 0s
2026-09-20 18:17:21 -04:00
Boris Mann c11ce119d4 Adding smtp url as a secret and sending from techops @ cosocial.ca
Deploy PDS / deploy (push) Canceled after 0s
2026-09-20 10:51:16 -07:00
gov 6428560093 Merge pull request 'feat: pds operator' (#1) from gov/pds-operator into main
Deploy PDS / deploy (push) Canceled after 0s
Reviewed-on: #1
2026-09-18 20:10:08 +00:00
7 changed files with 24 additions and 3 deletions

No files matched your search

+5
View File
@@ -56,6 +56,11 @@ jobs:
if [ -n "${{ vars.PDS_PRIMARY_COLOR }}" ]; then if [ -n "${{ vars.PDS_PRIMARY_COLOR }}" ]; then
echo "pds_primary_color: \"${{ vars.PDS_PRIMARY_COLOR }}\"" >> vars/main.yml echo "pds_primary_color: \"${{ vars.PDS_PRIMARY_COLOR }}\"" >> vars/main.yml
fi fi
# Optional: email/SMTP
if [ -n "${{ secrets.SMTP_URL }}" ]; then
echo "pds_email_smtp_url: ${{ secrets.SMTP_URL }}" >> vars/main.yml
fi
echo "pds_email_from_address: techops@cosocial.ca" >> vars/main.yml
- name: Run playbook - name: Run playbook
run: | run: |
+10
View File
@@ -168,6 +168,13 @@ Create an account:
pdsadmin account create pdsadmin account create
``` ```
Enroll an operator (admin dashboard) passkey — prints a single-use link, expires in 15 minutes; open it on the operator hostname over HTTPS (passkeys are per-hostname and need a secure context). Rerun to enroll another device or recover after losing all passkeys:
```bash
cd /pds/operator
sudo docker compose exec app node dist/cli.js enroll
```
## Teardown ## Teardown
Run on the server to remove everything, use with caution: Run on the server to remove everything, use with caution:
@@ -201,6 +208,8 @@ Auto-deploys on push to `main`. Set up these in Gitea repo settings (Settings >
| `PDS_SERVICE_NAME` | *(optional)* PDS display name for branding | | `PDS_SERVICE_NAME` | *(optional)* PDS display name for branding |
| `PDS_PRIMARY_COLOR` | *(optional)* Primary color (hex) for branding | | `PDS_PRIMARY_COLOR` | *(optional)* Primary color (hex) for branding |
Outgoing emails are sent from `techops@cosocial.ca` (fixed in the workflow).
**Secrets** (sensitive credentials): **Secrets** (sensitive credentials):
| Secret | Description | | Secret | Description |
@@ -208,5 +217,6 @@ Auto-deploys on push to `main`. Set up these in Gitea repo settings (Settings >
| `SSH_PRIVATE_KEY` | Private SSH key for the `sysadmin` user on the target server | | `SSH_PRIVATE_KEY` | Private SSH key for the `sysadmin` user on the target server |
| `OVH_S3_ACCESS_KEY` | OVH S3 access key for blob storage | | `OVH_S3_ACCESS_KEY` | OVH S3 access key for blob storage |
| `OVH_S3_SECRET_KEY` | OVH S3 secret key for blob storage | | `OVH_S3_SECRET_KEY` | OVH S3 secret key for blob storage |
| `SMTP_URL` | *(optional)* SMTP URL with credentials (e.g., `smtps://user:pass@smtp.example.com/`) |
The workflow installs Ansible, writes the SSH key from a secret, generates `inventory.yml` and `vars/main.yml` from vars and secrets, and runs the playbook. The workflow installs Ansible, writes the SSH key from a secret, generates `inventory.yml` and `vars/main.yml` from vars and secrets, and runs the playbook.
+1 -1
View File
@@ -253,7 +253,7 @@
- name: Operator health check - name: Operator health check
uri: uri:
url: "https://operator.{{ pds_hostname }}/oauth/client-metadata.json" url: "https://{{ pds_operator_hostname }}/oauth/client-metadata.json"
method: GET method: GET
status_code: 200 status_code: 200
retries: 5 retries: 5
+1 -1
View File
@@ -16,7 +16,7 @@
reverse_proxy http://localhost:3000 reverse_proxy http://localhost:3000
} }
{% if pds_operator_enabled is defined and pds_operator_enabled | bool %} {% if pds_operator_enabled is defined and pds_operator_enabled | bool %}
operator.{{ pds_hostname }} { {{ pds_operator_hostname }} {
log { log {
output stdout output stdout
format json format json
+5
View File
@@ -13,6 +13,11 @@ services:
- AUDIT_LOG_PATH=/data/audit.log - AUDIT_LOG_PATH=/data/audit.log
ports: ports:
- "127.0.0.1:8787:8787" - "127.0.0.1:8787:8787"
# the host's /etc/hosts maps the PDS hostname to 127.0.1.1 (cloud-init
# manage_etc_hosts), which Docker propagates to container DNS — pin the
# real address so the operator can reach the PDS
extra_hosts:
- "{{ pds_hostname }}:{{ hostvars[inventory_hostname].ansible_default_ipv4.address }}"
volumes: volumes:
# bind mount keeps data under /pds — captured by the backup tarball # bind mount keeps data under /pds — captured by the backup tarball
- ./data:/data - ./data:/data
+1 -1
View File
@@ -5,4 +5,4 @@ RELAY_HOSTNAME=bsky.network
SESSION_SECRET={{ pds_operator_session_secret }} SESSION_SECRET={{ pds_operator_session_secret }}
PORT=8787 PORT=8787
APPVIEW_URL=https://bsky.app APPVIEW_URL=https://bsky.app
DASHBOARD_URL=https://operator.{{ pds_hostname }} DASHBOARD_URL=https://{{ pds_operator_hostname }}
+1
View File
@@ -55,3 +55,4 @@ pds_crawlers: https://relay.fire.hose.cam # relay/crawler endpoint
pds_operator_enabled: true pds_operator_enabled: true
pds_operator_repo: https://tangled.org/brookie.blog/pds-operator pds_operator_repo: https://tangled.org/brookie.blog/pds-operator
pds_operator_version: main pds_operator_version: main
pds_operator_hostname: pds-operator.cosocial.ca