From 1752408651ef87cd02e188a07b570168bbd7db20 Mon Sep 17 00:00:00 2001 From: Benjamin Sonntag Date: Tue, 24 Feb 2015 19:05:48 +0100 Subject: [PATCH] [fix] ensure aliases start by / --- ssl/Makefile | 1 + ssl/ssl_alias_manager.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ssl/Makefile b/ssl/Makefile index a00123d6..90f4adee 100755 --- a/ssl/Makefile +++ b/ssl/Makefile @@ -20,6 +20,7 @@ install: install -m 0644 -g root -o root ssl.sql $(DESTDIR)/usr/share/alternc/install/ install -m 0755 -g root -o root alternc-ssl.install.php $(DESTDIR)/usr/lib/alternc/install.d/alternc-ssl install -m 0644 -g root -o root README.txt $(DESTDIR)/var/lib/alternc/ssl/private/ + install -m 0644 -g root -o root apache2.conf $(DESTDIR)/etc/apache2/conf.d/alternc-ssl-alias.conf # incron install -m 0755 -g root -o root ssl_alias_manager.sh $(DESTDIR)/usr/lib/alternc/ diff --git a/ssl/ssl_alias_manager.sh b/ssl/ssl_alias_manager.sh index 8a755822..ab1b81cc 100755 --- a/ssl/ssl_alias_manager.sh +++ b/ssl/ssl_alias_manager.sh @@ -15,8 +15,8 @@ mkdir -p "$FILEDIR" mysql --defaults-file=/etc/alternc/my.cnf --skip-column-names -B -e "SELECT name,content FROM certif_alias;" | while read name content do - echo "alias $name ${FILEDIR}${name}" >>$TMP - echo "$content" >"${FILEDIR}${name}" + echo "alias /$name ${FILEDIR}/${name}" >>$TMP + echo "$content" >"${FILEDIR}/${name}" done if ! diff -q "$TMP" "$APACHECONF" then