Compare commits
12 commits
Author | SHA1 | Date | |
---|---|---|---|
8d71044107 | |||
9292416cc2 | |||
1353f75d29 | |||
d0b86f7dd4 | |||
43b6912977 | |||
14a7fe0d02 | |||
2e549ee3ff | |||
b6c11afbb7 | |||
c300ebac74 | |||
e9fcdb1ad6 | |||
1f874b0351 | |||
f55a924e36 |
4 changed files with 32 additions and 10 deletions
|
@ -1,16 +1,16 @@
|
||||||
pipeline:
|
pipeline:
|
||||||
build:
|
build:
|
||||||
image: woodpeckerci/plugin-docker-buildx:latest
|
image: woodpeckerci/plugin-docker-buildx
|
||||||
settings:
|
settings:
|
||||||
repo: git.dreamfall.space/${CI_REPO_OWNER}/prosody
|
repo: git.dreamfall.space/${CI_REPO_OWNER}/prosody
|
||||||
registry: git.dreamfall.space
|
registry: git.dreamfall.space
|
||||||
auto_tag: true
|
tag: latest
|
||||||
username: ${CI_REPO_OWNER}
|
username: ${CI_REPO_OWNER}
|
||||||
password:
|
password:
|
||||||
from_secret: git_token
|
from_secret: git_token
|
||||||
|
|
||||||
notify:
|
notify:
|
||||||
image: deblan/woodpecker-email:latest
|
image: deblan/woodpecker-email
|
||||||
settings:
|
settings:
|
||||||
from: woodpecker@clacks.network
|
from: woodpecker@clacks.network
|
||||||
host: smtp.migadu.com
|
host: smtp.migadu.com
|
||||||
|
|
14
Dockerfile
14
Dockerfile
|
@ -1,18 +1,28 @@
|
||||||
FROM debian:bullseye-slim
|
FROM debian:bookworm-slim
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install ca-certificates extrepo -y && \
|
apt-get install ca-certificates extrepo -y && \
|
||||||
extrepo enable prosody && \
|
extrepo enable prosody && \
|
||||||
apt-get update && \
|
apt-get update && \
|
||||||
apt-get install prosody prosody-modules -y
|
apt-get install prosody prosody-modules lua5.4 liblua5.4-dev lua-luaossl -y
|
||||||
|
|
||||||
RUN mkdir -p /run/prosody/ && \
|
RUN mkdir -p /run/prosody/ && \
|
||||||
chown -R prosody:prosody /run/prosody/
|
chown -R prosody:prosody /run/prosody/
|
||||||
|
|
||||||
RUN mkdir -p /etc/prosody/conf.d/
|
RUN mkdir -p /etc/prosody/conf.d/
|
||||||
|
|
||||||
|
RUN update-alternatives --set lua-interpreter /usr/bin/lua5.4
|
||||||
|
|
||||||
COPY prosody.cfg.lua /etc/prosody/prosody.cfg.lua
|
COPY prosody.cfg.lua /etc/prosody/prosody.cfg.lua
|
||||||
|
|
||||||
|
RUN mkdir -p /usr/local/prosody/custom_plugins/lib/luarocks/rocks-5.4
|
||||||
|
RUN chown -R prosody:prosody /usr/local/prosody
|
||||||
|
RUN prosodyctl install --server=https://modules.prosody.im/rocks/ mod_cloud_notify_extensions
|
||||||
|
#RUN prosodyctl install --server=https://modules.prosody.im/rocks/ mod_sasl2
|
||||||
|
#RUN prosodyctl install --server=https://modules.prosody.im/rocks/ mod_sasl2_bind2
|
||||||
|
#RUN prosodyctl install --server=https://modules.prosody.im/rocks/ mod_sasl2_sm
|
||||||
|
#RUN prosodyctl install --server=https://modules.prosody.im/rocks/ mod_sasl2_fast
|
||||||
|
|
||||||
EXPOSE 5222
|
EXPOSE 5222
|
||||||
EXPOSE 5269
|
EXPOSE 5269
|
||||||
EXPOSE 5280
|
EXPOSE 5280
|
||||||
|
|
10
Jenkinsfile
vendored
10
Jenkinsfile
vendored
|
@ -1,7 +1,8 @@
|
||||||
pipeline {
|
pipeline {
|
||||||
agent none
|
agent none
|
||||||
environment {
|
environment {
|
||||||
CHAT = "devel@conference.mcmillian.dev"
|
CHAT = "spacenerdmo@clacks.network"
|
||||||
|
MAIL = "morgan@mcmillian.dev"
|
||||||
}
|
}
|
||||||
stages {
|
stages {
|
||||||
stage('Build docker image') {
|
stage('Build docker image') {
|
||||||
|
@ -12,8 +13,8 @@ pipeline {
|
||||||
steps {
|
steps {
|
||||||
jabberNotify buildToChatNotifier: [$class: 'ExtraMessageOnlyBuildToChatNotifier'], extraMessage: 'Build Started', notifySuspects: true, targets: "${CHAT}"
|
jabberNotify buildToChatNotifier: [$class: 'ExtraMessageOnlyBuildToChatNotifier'], extraMessage: 'Build Started', notifySuspects: true, targets: "${CHAT}"
|
||||||
script {
|
script {
|
||||||
docker.withRegistry('https://git.dreamfall.space/thrrgilag', 'thrrgilag-forgejo-pkg') {
|
docker.withRegistry('https://git.dreamfall.space/spacenerdmo', 'spacenerdmo-pkg-pub') {
|
||||||
def customImage = docker.build("git.dreamfall.space/thrrgilag/prosody:${TAG}")
|
def customImage = docker.build("git.dreamfall.space/spacenerdmo/prosody:${TAG}")
|
||||||
customImage.push()
|
customImage.push()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -24,6 +25,9 @@ pipeline {
|
||||||
}
|
}
|
||||||
failure {
|
failure {
|
||||||
jabberNotify buildToChatNotifier: [$class: 'ExtraMessageOnlyBuildToChatNotifier'], extraMessage: 'Build Failed', notifySuspects: true, targets: "${CHAT}"
|
jabberNotify buildToChatNotifier: [$class: 'ExtraMessageOnlyBuildToChatNotifier'], extraMessage: 'Build Failed', notifySuspects: true, targets: "${CHAT}"
|
||||||
|
mail to: "${MAIL}",
|
||||||
|
subject: "Deploy Failed: ${currentBuild.fullDisplayName}",
|
||||||
|
body: "Something is wrong with ${env.BUILD_URL}"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,6 +26,7 @@ admins = { }
|
||||||
-- will search first for modules. For additional modules you can install, see
|
-- will search first for modules. For additional modules you can install, see
|
||||||
-- the community module repository at https://modules.prosody.im/
|
-- the community module repository at https://modules.prosody.im/
|
||||||
--plugin_paths = { }
|
--plugin_paths = { }
|
||||||
|
installer_plugin_path = "/usr/local/prosody/custom_plugins"
|
||||||
|
|
||||||
-- This is the list of modules Prosody will load on startup.
|
-- This is the list of modules Prosody will load on startup.
|
||||||
-- Documentation for bundled modules can be found at: https://prosody.im/doc/modules
|
-- Documentation for bundled modules can be found at: https://prosody.im/doc/modules
|
||||||
|
@ -50,7 +51,8 @@ modules_enabled = {
|
||||||
"vcard_legacy"; -- Conversion between legacy vCard and PEP Avatar, vcard
|
"vcard_legacy"; -- Conversion between legacy vCard and PEP Avatar, vcard
|
||||||
|
|
||||||
-- Nice to have
|
-- Nice to have
|
||||||
"csi_simple"; -- Simple but effective traffic optimizations for mobile devices
|
-- "csi_simple"; -- Simple but effective traffic optimizations for mobile devices
|
||||||
|
"csi_battery_saver";
|
||||||
"invites"; -- Create and manage invites
|
"invites"; -- Create and manage invites
|
||||||
"invites_adhoc"; -- Allow admins/users to create invitations via their client
|
"invites_adhoc"; -- Allow admins/users to create invitations via their client
|
||||||
"invites_register"; -- Allows invited users to create accounts
|
"invites_register"; -- Allows invited users to create accounts
|
||||||
|
@ -72,6 +74,12 @@ modules_enabled = {
|
||||||
"websocket"; -- XMPP over WebSockets
|
"websocket"; -- XMPP over WebSockets
|
||||||
|
|
||||||
-- Other specific functionality
|
-- Other specific functionality
|
||||||
|
"cloud_notify";
|
||||||
|
"cloud_notify_extensions";
|
||||||
|
--"sasl2";
|
||||||
|
--"sasl2_bind2";
|
||||||
|
--"sasl2_sm";
|
||||||
|
--"sasl2_fast";
|
||||||
--"announce"; -- Send announcement to all online users
|
--"announce"; -- Send announcement to all online users
|
||||||
--"groups"; -- Shared roster support
|
--"groups"; -- Shared roster support
|
||||||
--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
|
--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
|
||||||
|
|
Loading…
Reference in a new issue