Compare commits

...

20 commits

Author SHA1 Message Date
2405304ffd prosody: plugin_paths cleared
we do not need community moules, therefore no path needs to be specified
2025-03-24 00:13:39 +01:00
331240beb2 prosody: use_libevent removed
there is auto-detection in place since 0.12
2025-03-24 00:13:39 +01:00
8331e66497 prosody: daemonize removed
this is handled via cli option and therefore by docker
2025-03-24 00:13:39 +01:00
dd55a3a692 prosody.cfg: migrated to 0.12
disabled modules that are now in core:
* csi_battery_saver
* graceful_shutdown

enabled modules:
* csi & csi_simple as replacement for csi_battery_saver
* mam (because xmpp feels unusable without them)
* muc_mam (because we need mam in muc)
* limits (nice protection)
* bookmarks (because of a more unified user experience)

added but disabled
* cloud_notify (will be in 0.13 - it is a community module now. Use it
  then)
* http - this allows http uploads and image sharing but was disabled
  before so not enabling now
* vcard_muc - this allows to set vcards for muc ie change profile
  picture. It is however a community module and thus disabled by
  default.
2025-03-24 00:13:39 +01:00
fd039c143f Merge pull request 'Update netz39/ampel-controller Docker tag to v0.2.0' () from renovate/netz39-ampel-controller-0.x into master
Reviewed-on: 
2025-03-23 21:54:13 +01:00
94757d9785 Update netz39/ampel-controller Docker tag to v0.2.0 2025-03-23 21:53:57 +01:00
db49b5c862 Merge pull request 'Update dependency 24367dfa.dehydrated to v2.1.0' () from renovate/24367dfa.dehydrated-2.x into master
Reviewed-on: 
2025-03-23 21:53:24 +01:00
b1b480f415 Update dependency 24367dfa.dehydrated to v2.1.0 2025-03-23 20:23:14 +00:00
21125a3784 Merge pull request 'Update codeberg.org/forgejo/forgejo Docker tag to v10.0.3' () from renovate/codeberg.org-forgejo-forgejo-10.x into master
Reviewed-on: 
2025-03-23 11:33:17 +01:00
4c467865e7 Update codeberg.org/forgejo/forgejo Docker tag to v10.0.3 2025-03-23 09:18:06 +00:00
470cd03c57 Merge pull request 'Update renovate/renovate Docker tag to v39.211.0' () from renovate/renovate-renovate-39.x into master
Reviewed-on: 
2025-03-22 19:57:09 +01:00
5a41489246 Update renovate/renovate Docker tag to v39.211.0 2025-03-22 19:56:47 +01:00
1b2cb40096 Merge pull request 'Update codeberg.org/forgejo/forgejo Docker tag to v10.0.2' () from renovate/codeberg.org-forgejo-forgejo-10.x into master
Reviewed-on: 
2025-03-22 19:56:22 +01:00
1135385fe6 Update codeberg.org/forgejo/forgejo Docker tag to v10.0.2 2025-03-21 13:18:04 +00:00
392d1970f7 Merge pull request 'Update shlinkio/shlink Docker tag to v4.4.6' () from renovate/shlinkio-shlink-4.x into master
Reviewed-on: 
2025-03-20 17:07:06 +01:00
cdc1d52a38 Update shlinkio/shlink Docker tag to v4.4.6 2025-03-20 11:58:41 +01:00
09359799b8 Merge pull request '✏️ host: pottwal: Fix misleading task name' () from alex/netz39-infra-ansible:pottwal into master
Reviewed-on: 
Reviewed-by: Stefan Haun <tux@netz39.de>
2025-03-20 11:58:15 +01:00
725fa1d074 ✏️ host: pottwal: Fix misleading task name
Looks like a copy'n'paste mistake.  Improve the other task name while at
it.

Fixes: 88e14f7ca6 ("👌 pottwal: Move prosody config to /etc")
2025-03-19 22:00:12 +01:00
c01f6b263e Merge pull request 'Update renovate/renovate Docker tag to v39.206.0' () from renovate/renovate-renovate-39.x into master
Reviewed-on: 
2025-03-17 10:23:33 +01:00
b05df7aa1d Update renovate/renovate Docker tag to v39.206.0 2025-03-17 08:18:07 +00:00
6 changed files with 40 additions and 23 deletions
files/prosody
host-pottwal.yml
host_vars
pottwal.n39.eu
wittgenstein.n39.eu
requirements.yml
templates/prosody

View file

@ -11,6 +11,10 @@ VirtualHost "jabber.n39.eu"
--- Store MUC messages in an archive and allow users to access it
--modules_enabled = { "muc_mam" }
Component "conference.jabber.n39.eu" "muc"
modules_enabled = {
"muc_mam";
-- "vcard_muc";
}
-- alex: service discovery
disco_items = {

View file

@ -184,7 +184,7 @@
msg: "prosody data dir is missing, please restore from the backup!"
when: not prosody_dir.stat.exists
- name: Ensure prosody config dir exists
- name: Ensure prosody main config dir exists
ansible.builtin.file:
path: "{{ prosody_config_dir }}"
state: directory
@ -204,7 +204,7 @@
state: directory
mode: 0755
- name: Ensure prosody certs dir exists
- name: Ensure prosody conf.d dir exists
ansible.builtin.file:
path: "{{ prosody_config_dir }}/conf.d"
state: directory

View file

@ -12,11 +12,11 @@ cleanuri_amqp_vhost: "/cleanuri"
forgejo_host_port: 9091
forgejo_ssh_port: 2222
forgejo_domain_name: git.n39.eu
forgejo_image: codeberg.org/forgejo/forgejo:10.0.1
forgejo_image: codeberg.org/forgejo/forgejo:10.0.3
shlink_host_port: 8083
shlink_domain_name: sl.n39.eu
shlink_image: shlinkio/shlink:4.4.5
shlink_image: shlinkio/shlink:4.4.6
shlink_initial_api_key: "{{ vault_shlink_initial_api_key }}"
shlink_postgres_password: "{{ vault_shlink_postgres_password }}"
@ -59,7 +59,7 @@ homebox_host_port: 8092
homebox_domain_name: inventory.n39.eu
homebox_image: ghcr.io/hay-kot/homebox:v0.10.3
renovate_image: renovate/renovate:39.198.1
renovate_image: renovate/renovate:39.211.0
renovate_forgejo_pat: "{{ vault_renovate_forgejo_pat }}"
renovate_github_pat: "{{ vault_renovate_github_pat }}"
renovate_git_user: "Renovate Bot <accounts+renovatebot@netz39.de>"

View file

@ -11,7 +11,7 @@ spaceapi_image: netz39/spaceapi-service:0.1.1
spaceapi_topic_status: "Netz39/SpaceAPI/isOpen"
spaceapi_topic_lastchange: "Netz39/SpaceAPI/lastchange"
ampelcontroller_image: netz39/ampel-controller:0.1.0
ampelcontroller_image: netz39/ampel-controller:0.2.0
topic_lever_state: "Netz39/Things/StatusSwitch/Lever/State"
topic_door_events: "Netz39/Things/Door/Events"
topic_traffic_light: "Netz39/Things/Ampel/Light"

View file

@ -7,7 +7,7 @@ roles:
version: 4.0.0
- name: 24367dfa.dehydrated
src: git+https://github.com/24367dfa/ansible-role-dehydrated.git
version: 2.0.0
version: 2.1.0
- name: penguineer.dehydrated_cron
src: https://github.com/penguineer/ansible-role-dehydrated_cron.git
version: v1.1.0

View file

@ -1,6 +1,3 @@
-- When running in Docker do not daemonize (for nice shutdown, logging etc.)
daemonize = false;
-- Prosody XMPP Server Configuration
--
-- Information on configuring Prosody can be found on our
@ -25,14 +22,10 @@ daemonize = false;
-- Example: admins = { "user1@example.com", "user2@example.net" }
admins = { "alex@{{ prosody_domain_name }}", "tux@{{ prosody_domain_name }}" }
-- Enable use of libevent for better performance under high load
-- For more information see: https://prosody.im/doc/libevent
use_libevent = true
-- Prosody will always look in its source directory for modules, but
-- this option allows you to specify additional locations where Prosody
-- will look for modules first. For community modules, see https://modules.prosody.im/
plugin_paths = { "/usr/local/lib/prosody-modules" }
plugin_paths = { }
-- This is the list of modules Prosody will load on startup.
-- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too.
@ -45,8 +38,11 @@ modules_enabled = {
"tls"; -- Add support for secure TLS on c2s/s2s connections
"dialback"; -- s2s dialback support
"disco"; -- Service discovery
"limits"; -- bandwidth limits for xmpp connections
-- Not essential, but recommended
"bookmarks"; -- synchronize the list of open rooms between
clients
"carbons"; -- Keep multiple clients in sync
"pep"; -- Enables users to publish their avatar, mood, activity, playing music and more
"private"; -- Private XML storage (for room bookmarks, etc.)
@ -60,17 +56,22 @@ modules_enabled = {
"time"; -- Let others know the time here on this server
"ping"; -- Replies to XMPP pings with pongs
"register"; -- Allow users to register on this server using a client and change passwords
--"mam"; -- Store messages in an archive and allow users to access it
--"csi_simple"; -- Simple Mobile optimizations
"account_activity"; -- record time when account was last used
-- "cloud_notify"; -- push notifications for mobile devices
"mam"; -- Store messages in an archive and allow users to access it
"csi_simple"; -- Simple Mobile optimizations -- buffer
unimportant messages to inactive devices
-- Admin interfaces
"admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
"admin_telnet"; -- Opens telnet console interface on localhost port 5582
"admin_shell"; -- Opens telnet console interface on localhost port 5582
-- HTTP modules
--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
--"websocket"; -- XMPP over WebSockets
--"http_files"; -- Serve static files from a directory over HTTP
-- "http"; -- allow http uploads
-- Other specific functionality
--"limits"; -- Enable bandwidth limiting for XMPP connections
@ -82,12 +83,7 @@ modules_enabled = {
--"motd"; -- Send a message to users when they log in
--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
--"proxy65"; -- Enables a file transfer proxy service which clients behind NAT can use
-- alex
"smacks"; -- XEP-0198: Stream Management
"csi"; -- XEP-0352: Client State Indication
"csi_battery_saver";
"graceful_shutdown";
}
-- These modules are auto-loaded, but should you want
@ -99,6 +95,16 @@ modules_disabled = {
-- "posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
}
limits = {
c2s = {
rate = "200kb/s";
};
s2sin = {
rate = "1000kb/s";
};
}
-- Disable account creation by default, for security
-- For more information see https://prosody.im/doc/creating_accounts
allow_registration = false
@ -144,6 +150,13 @@ authentication = "internal_hashed"
storage = "sql" -- Default is "internal"
-- Component "xmpp.n39.eu" "http_file_share"
-- http_file_share_size_limit = 160*1024*1024;
-- http_file_share_daily_quota = 500*1024*1024;
-- http_file_share_expires_after = 7*24*60*60;
-- For the "sql" backend, you can uncomment *one* of the below to configure:
sql = { driver = "SQLite3", database = "prosody.sqlite" } -- Default. 'database' is the filename.
--sql = { driver = "MySQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" }