Compare commits
10 Commits
91af50902d
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9673cd78a3 | ||
|
|
93f32ec3be | ||
|
|
eddb4b3531 | ||
|
|
bb7596ffdd | ||
|
|
034a12c0fd | ||
|
|
36751f5229 | ||
|
|
e207af3ca6 | ||
|
|
6feff1c7e6 | ||
|
|
2d86df749b | ||
|
|
e78b3474cd |
@@ -7,7 +7,7 @@ description: Create a new semver release. Usage: /release-new [major|minor|patch
|
||||
|
||||
- Current latest tag: !`git describe --tags --abbrev=0 2>/dev/null || echo "none"`
|
||||
- Current branch: !`git branch --show-current`
|
||||
- Unreleased commits: !`git log $(git describe --tags --abbrev=0 2>/dev/null || echo "")..HEAD --oneline 2>/dev/null || git log --oneline`
|
||||
- Unreleased commits: !`git log --oneline -20`
|
||||
|
||||
## Your task
|
||||
|
||||
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1,2 +1,4 @@
|
||||
.env
|
||||
data/prosody/certs
|
||||
web-sites
|
||||
logs
|
||||
|
||||
10
CHANGELOG.md
10
CHANGELOG.md
@@ -2,6 +2,12 @@
|
||||
|
||||
All notable changes to this project will be documented in this file.
|
||||
|
||||
## [0.1.1] - 2026-03-23
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
- Fix: fix shell substitution in release-new command context
|
||||
|
||||
## [0.1.0] - 2026-03-23
|
||||
|
||||
### Bug Fixes
|
||||
@@ -82,4 +88,8 @@ Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
|
||||
|
||||
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
|
||||
|
||||
### Miscellaneous Tasks
|
||||
|
||||
- Chore: release v0.1.0
|
||||
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@ FROM debian:bookworm-slim
|
||||
RUN apt-get update --fix-missing && \
|
||||
apt-get install -y --no-install-recommends \
|
||||
prosody \
|
||||
prosody-modules \
|
||||
lua-dbi-mysql \
|
||||
lua-sec \
|
||||
lua-unbound \
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
|
||||
admins = { "admin@guschin.info", "admin@xmpp.guschin.info" }
|
||||
|
||||
plugin_paths = { "/usr/lib/prosody/modules" }
|
||||
|
||||
modules_enabled = {
|
||||
-- Generally required
|
||||
"roster";
|
||||
@@ -25,6 +27,10 @@ modules_enabled = {
|
||||
|
||||
-- Admin interface
|
||||
"admin_adhoc";
|
||||
|
||||
-- Gateway support
|
||||
"privilege";
|
||||
"http_file_share";
|
||||
};
|
||||
|
||||
modules_disabled = {
|
||||
@@ -53,6 +59,7 @@ sql = {
|
||||
c2s_ports = { 5222 }
|
||||
s2s_ports = { 5269 }
|
||||
component_ports = { 5347 }
|
||||
component_interface = "0.0.0.0"
|
||||
http_ports = { 5280 }
|
||||
https_ports = { 5281 }
|
||||
|
||||
@@ -75,6 +82,17 @@ VirtualHost "guschin.info"
|
||||
key = "/etc/prosody/certs/guschin.info.key";
|
||||
certificate = "/etc/prosody/certs/guschin.info.crt";
|
||||
}
|
||||
privileged_entities = {
|
||||
["telegram.guschin.info"] = {
|
||||
roster = "both"; -- auto add/remove Telegram contacts from roster
|
||||
message = "outgoing"; -- reflect messages sent via official Telegram apps
|
||||
iq = {
|
||||
["http://jabber.org/protocol/pubsub"] = "both"; -- PEP bookmarks
|
||||
["http://jabber.org/protocol/pubsub#owner"] = "set"; -- message display sync
|
||||
["urn:xmpp:http:upload:0"] = "get"; -- upload on behalf of users
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
-- Secondary virtual host (user@xmpp.guschin.info)
|
||||
VirtualHost "xmpp.guschin.info"
|
||||
@@ -87,3 +105,11 @@ VirtualHost "xmpp.guschin.info"
|
||||
Component "muc.guschin.info" "muc"
|
||||
modules_enabled = { "muc_mam" }
|
||||
storage = "sql"
|
||||
|
||||
-- HTTP file upload (XEP-0363) — used by slidgram for Telegram→XMPP attachments
|
||||
Component "upload.guschin.info" "http_file_share"
|
||||
http_file_share_access = { "telegram.guschin.info" }
|
||||
|
||||
-- Telegram gateway (slidgram)
|
||||
Component "telegram.guschin.info"
|
||||
component_secret = os.getenv("SLIDGRAM_COMPONENT_SECRET")
|
||||
|
||||
@@ -12,6 +12,7 @@ services:
|
||||
MYSQL_USER: ${MYSQL_USER}
|
||||
MYSQL_PASSWORD: ${MYSQL_PASSWORD}
|
||||
MYSQL_DATABASE: ${MYSQL_DATABASE}
|
||||
SLIDGRAM_COMPONENT_SECRET: ${SLIDGRAM_COMPONENT_SECRET}
|
||||
extra_hosts:
|
||||
- "host.docker.internal:172.17.0.1"
|
||||
ports:
|
||||
@@ -38,6 +39,25 @@ services:
|
||||
networks:
|
||||
- prosody
|
||||
|
||||
slidgram:
|
||||
image: codeberg.org/slidge/slidgram:latest
|
||||
container_name: slidgram
|
||||
user: "100:102"
|
||||
environment:
|
||||
SLIDGE_JID: telegram.guschin.info
|
||||
SLIDGE_SECRET: ${SLIDGRAM_COMPONENT_SECRET}
|
||||
SLIDGE_SERVER: prosody-xmpp
|
||||
SLIDGE_PORT: 5347
|
||||
SLIDGE_UPLOAD_SERVICE: upload.guschin.info
|
||||
volumes:
|
||||
- ./data/slidgram:/var/lib/slidge
|
||||
restart: unless-stopped
|
||||
depends_on:
|
||||
prosody:
|
||||
condition: service_healthy
|
||||
networks:
|
||||
- prosody
|
||||
|
||||
networks:
|
||||
prosody:
|
||||
driver: bridge
|
||||
|
||||
Reference in New Issue
Block a user