From 195cda58d27d0407a5c954ce0cda2a96b33b6e6e Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Sun, 22 Dec 2024 12:14:17 +0100
Subject: [PATCH] Fix CI install modules

---
 .github/workflows/CI.yml | 13 +++++++------
 .gitignore               |  2 ++
 server/modules/.gitkeep  |  0
 server/prosody.cfg.lua   |  2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)
 delete mode 100644 server/modules/.gitkeep

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index cde830fac..4ad7ce181 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -26,13 +26,14 @@ jobs:
         run: |
           echo deb http://packages.prosody.im/debian $(lsb_release -sc) main | sudo tee /etc/apt/sources.list.d/prosody.list
           sudo wget https://prosody.im/files/prosody-debian-packages.key -O/etc/apt/trusted.gpg.d/prosody.gpg
-          sudo apt update
-          sudo apt install lua5.3 prosody-trunk lua-bitop lua-sec luarocks
+          sudo apt-get update
+          sudo apt-get -y install lua5.3 liblua5.3-dev prosody-trunk lua-bitop lua-sec luarocks
           sudo service prosody stop
-          prosodyctl --config server/prosody.cfg.lua install mod_sasl2
-          prosodyctl --config server/prosody.cfg.lua install mod_sasl2_bind2
-          prosodyctl --config server/prosody.cfg.lua install mod_sasl2_fast
-          prosodyctl --config server/prosody.cfg.lua install mod_sasl2_sm
+          cd server
+          prosodyctl --config prosody.cfg.lua install mod_sasl2
+          prosodyctl --config prosody.cfg.lua install mod_sasl2_bind2
+          prosodyctl --config prosody.cfg.lua install mod_sasl2_fast
+          prosodyctl --config prosody.cfg.lua install mod_sasl2_sm
 
       # - run: npm install -g npm
       - run: make
diff --git a/.gitignore b/.gitignore
index f10012a20..2e1fdeb4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,8 @@ server/certs/
 server/prosody.err
 server/prosody.log
 server/prosody.pid
+server/modules
+server/.cache
 
 !.gitkeep
 !.editorconfig
diff --git a/server/modules/.gitkeep b/server/modules/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/server/prosody.cfg.lua b/server/prosody.cfg.lua
index 1af1d45ca..cb3eb0f84 100644
--- a/server/prosody.cfg.lua
+++ b/server/prosody.cfg.lua
@@ -6,7 +6,7 @@ local lfs = require "lfs";
 
 plugin_paths = { "modules" }
 plugin_server = "https://modules.prosody.im/rocks/"
-installer_plugin_path = "modules";
+installer_plugin_path = lfs.currentdir() .. "/modules";
 
 modules_enabled = {
   "roster";