[Openvas-commits] r1161 - trunk/openvas-server

[scm-commit@wald.intevation.org]

Author: jfs
Date: 2008-08-22 02:07:08 +0200 (Fri, 22 Aug 2008)
New Revision: 1161

Modified:
   trunk/openvas-server/openvas-mkcert-client.in
Log:
Proper fix for the FHS issue, the "fix" introduced in release 150 actually made this script use /var/openvas/CA for some of the keys when it should be using
/var/lib/openvas/CA instead (/var/openvas is not a FHS directory)

This fix is based in the patch introduced in Debian for nessus-core (since, at
least 1.2.6, 6 years ago).



Modified: trunk/openvas-server/openvas-mkcert-client.in
===================================================================
--- trunk/openvas-server/openvas-mkcert-client.in	2008-08-21 23:35:43 UTC (rev 1160)
+++ trunk/openvas-server/openvas-mkcert-client.in	2008-08-22 00:07:08 UTC (rev 1161)
@@ -40,7 +40,7 @@
 prefix=@prefix@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
-localstatedir=@localstatedir@/lib
+localstatedir=@localstatedir@
 sharedstatedir=@sharedstatedir@
 sbindir=@exec_prefix@/sbin
 bindir=@exec_prefix@/bin
@@ -134,8 +134,8 @@
 
 
 
-OPENVASPRIV="$localstatedir/openvas/CA"
-OPENVASPUB="$sharedstatedir/openvas/CA"
+OPENVASPRIV="@OPENVAS_STATEDIR@/private/CA"
+OPENVASPUB="@OPENVAS_SHAREDSTATEDIR@/CA"
 
 while [ ! -d "$OPENVASPRIV" ]; do
     gettext "OpenVAS server 'private' directory: "
@@ -175,7 +175,7 @@
 done
 
 if [ "$R" = `gettext "y"` ]; then
-    USERSDIR=$localstatedir/openvas/users
+    USERSDIR=$localstatedir/lib/openvas/users
     while [ ! -d "$USERSDIR" ]; do
 	eval_gettext "\$USERSDIR: not a directory."; echo
 	gettext "Users directory? "