From 1f2e749c54e68a890809c1ef596fab5e82f33b84 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Mon, 3 Aug 2015 16:01:57 +0000 Subject: Pull from trunk. svn path=/branches/tk705/; revision=6089 --- buildtools/debian-skeleton/rpki-rp.postinst | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'buildtools/debian-skeleton') diff --git a/buildtools/debian-skeleton/rpki-rp.postinst b/buildtools/debian-skeleton/rpki-rp.postinst index 9726785d..b9f666a2 100644 --- a/buildtools/debian-skeleton/rpki-rp.postinst +++ b/buildtools/debian-skeleton/rpki-rp.postinst @@ -30,9 +30,12 @@ setup_users() { setup_directories() { install -o rcynic -g rcynic -d /var/rcynic/data /var/rcynic/rpki-rtr - if test -d /var/www + if test -d /var/www/html && test -d /var/www/rcynic && test ! -d /var/www/html/rcynic then - install -o rcynic -g rcynic -d /var/www/rcynic + mv /var/www/rcynic /var/www/html/rcynic + elif test -d /var/www/html + then + install -o rcynic -g rcynic -d /var/www/html/rcynic fi install -o rpkirtr -g rcynic -m 775 -d /var/rcynic/rpki-rtr/sockets } -- cgit v1.2.3