From dc5d074690e85fff12602f2d29e5ee5e5da58d03 Mon Sep 17 00:00:00 2001
From: Yasen Pramatarov <yasen@lindeas.com>
Date: Thu, 11 Jul 2024 14:24:45 +0300
Subject: [PATCH] DEB packaging fixes

---
 CHANGELOG.md           |  1 +
 README.md              |  2 +-
 packaging/build-deb    |  4 +++-
 packaging/deb-postinst | 11 +++++++++--
 packaging/deb-postrm   | 11 +++++++++++
 5 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100755 packaging/deb-postrm

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8fe813..5d433dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ All notable changes to this project will be documented in this file.
 - gitlab: https://gitlab.com/lindeas/jilo-web/-/compare/v0.1...HEAD
 
 ### Added
+- Added duration calculation in conferences listing
 
 ### Changed
 
diff --git a/README.md b/README.md
index 9566661..54e48f8 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ To have a working installation, in addition to the code here you need a jilo dat
 
 The webpage for this project is https://lindeas.com/jilo. There you will find information about both Jilo and Jilo Web.
 
-The main git repo of Jilo Web is:
+The main git repo of **Jilo Web** is:
 - https://code.lindeas.com/lindeas/jilo-web
 
 It is mirrored at:
diff --git a/packaging/build-deb b/packaging/build-deb
index f7ef3e6..3a80901 100755
--- a/packaging/build-deb
+++ b/packaging/build-deb
@@ -8,6 +8,7 @@ cd deb-package
 mkdir -p "jilo-web-$VERSION/DEBIAN"
 cp ../deb-control "jilo-web-$VERSION/DEBIAN/control"
 cp ../deb-postinst "jilo-web-$VERSION/DEBIAN/postinst"
+cp ../deb-postrm "jilo-web-$VERSION/DEBIAN/postrm"
 cp ../deb-templates "jilo-web-$VERSION/DEBIAN/templates"
 
 mkdir -p "jilo-web-$VERSION/etc/jilo-web"
@@ -15,9 +16,10 @@ cp ../../jilo-web.conf.php "jilo-web-$VERSION/etc/jilo-web/jilo-web.conf.php"
 cp ../../jilo-web.schema "jilo-web-$VERSION/etc/jilo-web/jilo-web.schema"
 
 mkdir -p "jilo-web-$VERSION/usr/share/jilo-web"
-cp -r ../../public_html "jilo-web-$VERSION/usr/share/jilo-web"
+cp -r ../../public_html/* "jilo-web-$VERSION/usr/share/jilo-web"
 
 mkdir -p "jilo-web-$VERSION/usr/share/doc/jilo-web"
+cp ../deb-README.debian "jilo-web-$VERSION/usr/share/doc/jilo-web/"
 cp ../../CHANGELOG.md "jilo-web-$VERSION/usr/share/doc/jilo-web/"
 cp ../../LICENSE "jilo-web-$VERSION/usr/share/doc/jilo-web/"
 cp ../../README.md "jilo-web-$VERSION/usr/share/doc/jilo-web/"
diff --git a/packaging/deb-postinst b/packaging/deb-postinst
index d81d0d8..c7900db 100755
--- a/packaging/deb-postinst
+++ b/packaging/deb-postinst
@@ -26,6 +26,7 @@ case "$1" in
         WEB_DIR="$RET"
 
         INSTALL_DIR="/usr/share/jilo-web"
+        DOC_DIR="/usr/share/doc/jilo-web"
 
         # store the info for later reconfiguration
         db_set jilo-web/domain $DOMAIN
@@ -37,14 +38,20 @@ case "$1" in
         # install and enable apache vhost
         if dpkg-query -W -f='${status}' apache2 2>/dev/null | grep -q "ok installed"; then
             WEB_SERVER="apache2"
-            cp "${INSTALL_DIR}/config.apache" /etc/apache2/sites-available/jilo-web.conf
+            cp "${DOC_DIR}/config.apache" /etc/apache2/sites-available/jilo-web.conf
+            sed -i -e "s/\$DOMAIN/$DOMAIN/g" /etc/apache2/sites-available/jilo-web.conf
+            # there is '/' in INSTALL_DIR, we use '%'
+            sed -i -e "s%\$INSTALL_DIR%$INSTALL_DIR%g" /etc/apache2/sites-available/jilo-web.conf
             a2ensite jilo-web.conf
             /etc/init.d/apache2 reload
 
         # install and enable nginx vhost
         elif dpkg-query -W -f='${status}' nginx 2>/dev/null | grep -q "ok installed"; then
             WEB_SERVER="nginx"
-            cp "${INSTALL_DIR}/config.nginx" /etc/nginx/sites-available/jilo-web
+            cp "${DOC_DIR}/config.nginx" /etc/nginx/sites-available/jilo-web
+            sed -i -e "s/\$DOMAIN/$DOMAIN/g" /etc/nginx/sites-available/jilo-web
+            # there is '/' in INSTALL_DIR, we use '%'
+            sed -i -e "s%\$INSTALL_DIR%$INSTALL_DIR%g" /etc/nginx/sites-available/jilo-web
             ln -s /etc/nginx/sites-available/jilo-web /etc/nginx/sites-enabled/
             /etc/init.d/nginx reload
         else
diff --git a/packaging/deb-postrm b/packaging/deb-postrm
new file mode 100755
index 0000000..4a6f910
--- /dev/null
+++ b/packaging/deb-postrm
@@ -0,0 +1,11 @@
+#!/bin/bash
+# postrm script for jilo-web
+#
+# see: dh_installdeb(1)
+
+set -e
+
+rm /etc/nginx/sites-enabled/jilo-web
+rm /etc/nginx/sites-available/jilo-web
+
+exit 0