From eb69139753f72961fceae14804ff1c638c009dd6 Mon Sep 17 00:00:00 2001 From: Camille Lafitte Date: Wed, 29 May 2024 20:26:21 +0200 Subject: [PATCH 1/2] fix: Provide a dummy ssl module * Workaround alternc.install behavior * Force an empty ssl apache configuration to prevent conflict between apache and nginx Fix #7 Reference AlternC/AlternC#561 --- Makefile | 1 + alternc-nginx-ssl-empty.conf | 3 +++ alternc-nginx-ssl-install | 8 ++++++++ 3 files changed, 12 insertions(+) create mode 100644 alternc-nginx-ssl-empty.conf diff --git a/Makefile b/Makefile index 914950c..6f1a9e8 100644 --- a/Makefile +++ b/Makefile @@ -29,3 +29,4 @@ install: install -m 0644 -o root -g root nginx-template.conf $(DESTDIR)/etc/alternc/templates/nginx/ install -m 750 alternc-nginx-ssl-install $(DESTDIR)/usr/lib/alternc/install.d/ install -m 0644 -o root -g root nginx-ssl-letsencrypt.conf $(DESTDIR)/etc/apache2/conf-enabled/ + install -m 0644 -o root -g root alternc-nginx-ssl-empty.conf $(DESTDIR)/etc/apache2/mods-available/ diff --git a/alternc-nginx-ssl-empty.conf b/alternc-nginx-ssl-empty.conf new file mode 100644 index 0000000..85452d2 --- /dev/null +++ b/alternc-nginx-ssl-empty.conf @@ -0,0 +1,3 @@ +##Workaround ssl activation from alternc.install +##Providean empty content +##We can't use /dev/null as is not regular file diff --git a/alternc-nginx-ssl-install b/alternc-nginx-ssl-install index 4d0d8c5..14a2483 100644 --- a/alternc-nginx-ssl-install +++ b/alternc-nginx-ssl-install @@ -22,6 +22,14 @@ # Purpose of file: Install nginx conf files. # ---------------------------------------------------------------------- +if [ "$1" = "apache2" ] +then + #Workaround alternc.install + #Pprevent a2endmo ssl + a2dismod ssl + ln -s /etc/apache2/mods-available/alternc-nginx-ssl-empty.conf /etc/apache2/mods-enabled/ssl.load +fi + if [ "$1" = "upgrade" ] then echo "Nginx Configuration:" From a540d45c21fa627a1706c035882548b3c3580857 Mon Sep 17 00:00:00 2001 From: Camille Lafitte Date: Fri, 31 May 2024 15:08:30 +0200 Subject: [PATCH 2/2] Declare /etc/apache2/mods-available as followed To build package we need to declare all directories managed --- debian/dirs | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/dirs b/debian/dirs index 3017272..4f4568c 100644 --- a/debian/dirs +++ b/debian/dirs @@ -3,4 +3,5 @@ /var/www/letsencrypt/.well-known/acme-challenge /usr/lib/alternc/install.d /etc/apache2/conf-enabled +/etc/apache2/mods-available/ /var/cache/nginx-ssl