Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Integrate prose-pod-api #17

Merged
merged 5 commits into from
Jun 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 1 addition & 21 deletions Prose.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,15 @@
# REST API for administrating a Prose Pod
# Configuration file
# Example: https://github.com/prose-im/prose-pod-api/blob/master/Prose.toml

[api]

log_level = "debug"

[server]

domain = "prose.org"

[assets]

path = "./res/assets/"
# All keys: https://github.com/prose-im/prose-pod-api/blob/master/service/src/config/mod.rs

[branding]

page_title = "Prose Pod API"
page_url = "https://admin.prose.org/"
company_name = "Prose"
icon_color = "#3458AD"
icon_url = "https://media.githubusercontent.com/media/prose-im/prose-medley/master/renders/logos/icon-social.png"
logo_color = "#3458AD"
logo_url = "https://raw.githubusercontent.com/prose-im/prose-medley/master/renders/logos/icon-app.svg"
website_url = "https://prose.org/"
support_url = "mailto:[email protected]"

[notify]

[notify.email]

from = "[email protected]"
to = "[email protected]"

Expand Down
3 changes: 3 additions & 0 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ services:
prose-network:
aliases:
- prose-pod-api
environment:
- RUST_LOG_STYLE=always
env_file:
- "${ENV_FILE:-.env}"

Expand All @@ -30,6 +32,7 @@ services:
prose-network:
aliases:
- prose-pod-server
- prose-pod-server-admin
env_file:
- "${ENV_FILE:-.env}"
entrypoint: >
Expand Down
3 changes: 1 addition & 2 deletions server/pod/etc/prosody/prosody.cfg.lua.initial
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,7 @@ VirtualHost "admin.prose.org.local"
}

-- HTTP settings
http_host = "prose-pod-server"
http_external_url = "http://prose-pod-server:5280"
http_host = "prose-pod-server-admin"

-- mod_init_admin
init_admin_jid = "[email protected]"
Expand Down
5 changes: 0 additions & 5 deletions server/pod/etc/prosody/roster_groups.txt

This file was deleted.