changed handling of default values and database paths:

- the default files yacy.init and for the network definition is now moved to the path defaults
- the httpProxy.conf is renamed to yacy.conf
- the DATA/INDEX/PUBLIC is renamed to the actual network nickname, which should be freeworld or sciencenet
more menu entries
- added apfelmaennchens alternative search page to the menu
- added the new thread dump page to the server log menu point as submenu
modifications
- modified the thread dump page: sorting by thread type

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4575 6c8d7289-2bf4-0310-a012-ef5d649a1542

1 files changed, 3 insertions, 3 deletions

diff --git a/stopYACY.sh b/stopYACY.sh
index 631a8c19d..ea46d1618 100755
--- a/stopYACY.sh
+++ b/stopYACY.sh
@@ -3,8 +3,8 @@ cd `dirname $0`
 
 if [ -x `which wget` ]
 then
-	port=`cat DATA/SETTINGS/httpProxy.conf |grep "^port="|sed "s/.*=//"`
-	pw=`cat DATA/SETTINGS/httpProxy.conf |grep "^adminAccountBase64MD5="|sed "s/.*=//"`
+	port=`cat DATA/SETTINGS/yacy.conf |grep "^port="|sed "s/.*=//"`
+	pw=`cat DATA/SETTINGS/yacy.conf |grep "^adminAccountBase64MD5="|sed "s/.*=//"`
 	wget -q -t 1 --timeout=5 --header "Authorization: realm=$pw" http://localhost:$port/Steering.html?shutdown=true -O /dev/null
 
 echo "Please wait until the YaCy daemon process terminates"
@@ -23,7 +23,7 @@ then
 	echo "You can monitor this with 'tail -f DATA/LOG/yacy00.log' and 'fuser log/yacy00.log'"
 
 else
-	port=`cat DATA/SETTINGS/httpProxy.conf |grep "^port="|sed "s/.*=//"`
+	port=`cat DATA/SETTINGS/yacy.conf |grep "^port="|sed "s/.*=//"`
 	echo "Neither wget nor java could be found or are not executable."
 	echo "Visit http://localhost:$port/Steering.html?shutdown=true to stop YaCy or (in emergency case) use ./killYACY.sh"
 fi