Author: nextgens
Date: 2008-06-04 11:31:44 +0000 (Wed, 04 Jun 2008)
New Revision: 20196
Modified:
trunk/apps/new_installer/scripts/1run.sh
Log:
new_installer: make the headless installer download plugins securely before the
node starts up
Modified: trunk/apps/new_installer/scripts/1run.sh
===================================================================
--- trunk/apps/new_installer/scripts/1run.sh 2008-06-04 08:55:07 UTC (rev
20195)
+++ trunk/apps/new_installer/scripts/1run.sh 2008-06-04 11:31:44 UTC (rev
20196)
@@ -15,6 +15,7 @@
CAFILE="startssl.pem"
+JOPTS="-Djava.net.preferIPv4Stack=true"
# We need the exec flag on /bin
chmod a+rx bin/* lib/* &>/dev/null
@@ -24,9 +25,6 @@
echo "Enabling the auto-update feature"
echo "node.updater.autoupdate=true" >> freenet.ini
-# Register plugins
-echo "pluginmanager.loadplugin=JSTUN;UPnP" >> freenet.ini
-
echo "Detecting tcp-ports availability..."
# Try to auto-detect the first available port for fproxy
FPROXY_PORT=8888
@@ -50,8 +48,6 @@
exit 1
fi
fi
- cat welcome.html | sed "s/8888/$FPROXY_PORT/g" >welcome2.html
- mv welcome2.html welcome.html
fi
echo "fproxy.enabled=true" >> freenet.ini
echo "fproxy.port=$FPROXY_PORT" >> freenet.ini
@@ -68,15 +64,24 @@
echo "fcp.port=$FCP_PORT" >> freenet.ini
echo "Downloading freenet-stable-latest.jar"
-java -jar bin/sha1test.jar freenet-stable-latest.jar "." $CAFILE >/dev/null ||
exit 1
+java $JOPTS -jar bin/sha1test.jar freenet-stable-latest.jar "." $CAFILE
>/dev/null || exit 1
ln -s freenet-stable-latest.jar freenet.jar
echo "Downloading freenet-ext.jar"
-java -jar bin/sha1test.jar freenet-ext.jar "." $CAFILE >/dev/null || exit 1
+java $JOPTS -jar bin/sha1test.jar freenet-ext.jar "." $CAFILE >/dev/null ||
exit 1
echo "Downloading update.sh"
-java -jar bin/sha1test.jar update.sh "." $CAFILE >/dev/null || exit 1
+java $JOPTS -jar bin/sha1test.jar update.sh "." $CAFILE >/dev/null || exit 1
chmod a+rx "./update.sh"
+
+# Register plugins
+mkdir -p plugins
+echo "pluginmanager.loadplugin=JSTUN;UPnP" >> freenet.ini
+echo "Downloading the JSTUN plugin"
+java $JOPTS -jar bin/sha1test.jar JSTUN.jar plugins "$CAFILE" >/dev/null 2>&1
+echo "Downloading the UPnP plugin"
+java $JOPTS -jar bin/sha1test.jar UPnP.jar plugins "$CAFILE" >/dev/null 2>&1
+
echo "Downloading seednodes.fref"
-java -jar bin/sha1test.jar seednodes.fref "." $CAFILE >/dev/null || exit 1
+java $JOPTS -jar bin/sha1test.jar seednodes.fref "." $CAFILE >/dev/null ||
exit 1
if test -x `which crontab`
then
@@ -99,7 +104,7 @@
# Starting the node up
./run.sh start
-echo "Please visit file://$PWD/welcome.html to configure your node"
+echo "Please visit http://127.0.0.1:$FPROXY_PORT/wizard/ to configure your
node"
echo "Finished"
rm -f bin/1run.sh
