Author: nextgens
Date: 2006-02-21 15:11:51 +0000 (Tue, 21 Feb 2006)
New Revision: 8081
Added:
trunk/apps/installer/installclasspath/config/freenet.ini
Removed:
trunk/apps/installer/installclasspath/config/node.conf
Modified:
trunk/apps/installer/antinstall-config.xml
trunk/apps/installer/build.xml
Log:
New installer featuring DSsize selection and max. BW
Modified: trunk/apps/installer/antinstall-config.xml
===================================================================
--- trunk/apps/installer/antinstall-config.xml 2006-02-21 13:34:13 UTC (rev
8080)
+++ trunk/apps/installer/antinstall-config.xml 2006-02-21 15:11:51 UTC (rev
8081)
@@ -93,7 +93,6 @@
force="true"/>
</page>
<page
- ifProperty="${l33t}+=1"
type="input"
name="config"
displayText="Initial node configuration (1)">
@@ -125,6 +124,42 @@
name="config"
displayText="Initial node configuration (2)">
<comment
+ displayText="How much bandwidth may be used by FED?"/>
+ <select
+ property="bandwidth"
+ displayText="Bandwidth value"
+ defaultValue="15"
+ >
+ <option text="8Kb/s" value="8"/>
+ <option text="10Kb/s" value="10"/>
+ <option text="15Kb/s" value="15"/>
+ <option text="30Kb/s" value="30"/>
+ <option text="60Kb/s" value="60"/>
+ <option text="100Kb/s" value="100"/>
+ <option text="150Kb/s" value="150"/>
+ </select>
+
+ <comment
+ displayText="Datastore Size"/>
+ <select
+ property="dsSize"
+ displayText="How much hard-drive space may use FED?"
+ defaultValue="1"
+ >
+ <option text="1G" value="1" />
+ <option text="2G" value="2" />
+ <option text="5G" value="5" />
+ <option text="10G" value="10" />
+ <option text="30G" value="30" />
+ </select>
+
+ </page>
+ <page
+ ifProperty="${l33t}+=1"
+ type="input"
+ name="config"
+ displayText="Initial node configuration (3)">
+ <comment
displayText="Which features should be enabled
?"/>
<checkbox
property="enableFRED"
@@ -143,12 +178,12 @@
property="enableSNMP"
displayText="Enable SNMP agent?"
defaultValue="true"
- force="false"/>
+ force="true"/>
<checkbox
property="enableFCP"
displayText="Enable FCP daemon?"
defaultValue="true"
- force="false"/>
+ force="true"/>
<checkbox
property="enableFproxy"
displayText="Enable Fproxy?"
Modified: trunk/apps/installer/build.xml
===================================================================
--- trunk/apps/installer/build.xml 2006-02-21 13:34:13 UTC (rev 8080)
+++ trunk/apps/installer/build.xml 2006-02-21 15:11:51 UTC (rev 8081)
@@ -8,13 +8,12 @@
<target name="env" unless="${l33t}==1">
<echo message="Using default configuration"/>
<property name="freenet-ext.present" value="true"/>
- <property name="hostName" value="hostName"/>
- <property name="portNumber" value="10000"/>
- <property name="nodeName" value="nodeName"/>
<property name="enableTestnet" value="true"/>
<property name="enableSNMP" value="true"/>
<property name="enableFCP" value="true"/>
<property name="enableFproxy" value="true"/>
+ <property name="dsSize" value="1"/>
+ <property name="bandwidth" value="15"/>
</target>
<target name="default" depends="env,tgmain,tgext,tgvrfy">
@@ -24,13 +23,13 @@
<echo message="Setting up the node"/>
- <copy todir="${installDir}/config">
+ <copy todir="${installDir}/">
<fileset dir="${basedir}/config/"/>
</copy>
- <replace file="${installDir}/config/node.conf">
- <replacefilter token="@l33t@" value="${l33t}"/>
- <replacefilter token="@password@" value="${password}"/>
+ <replace file="${installDir}/freenet.ini">
<replacefilter token="@hostname@" value="${hostName}"/>
+ <replacefilter token="@bandwidth@"
value="${bandwidth}"/>
+ <replacefilter token="@dsSize@" value="${dsSize}"/>
<replacefilter token="@portnumber@"
value="${portNumber}"/>
<replacefilter token="@nodename@" value="${nodeName}"/>
<replacefilter token="@enabletestnet@"
value="${enableTestnet}"/>
Copied: trunk/apps/installer/installclasspath/config/freenet.ini (from rev
8079, trunk/apps/installer/installclasspath/config/node.conf)
===================================================================
--- trunk/apps/installer/installclasspath/config/node.conf 2006-02-21
12:31:19 UTC (rev 8079)
+++ trunk/apps/installer/installclasspath/config/freenet.ini 2006-02-21
15:11:51 UTC (rev 8081)
@@ -0,0 +1,24 @@
+node.ipAddressOverride=@hostname@
+node.outputBandwidthLimit=@bandwidth at K
+node.swapRequestSendInterval=2000
+node.tempDir=./temp-32788
+node.storeSize=@dsSize at G
+node.storeDir=.
+node.listenPort=@portnumber@
+node.nodeDir=.
+node.downloadsDir=downloads
+node.testnet.enabled=@enabletestnet@
+node.testnet.port=33788
+fcp.enabled=@enablefcp@
+fcp.port=9481
+logger.maxCachedLines=100k
+logger.enabled=false
+logger.dirname=logs
+logger.maxCachedBytes=10M
+logger.priority=MINOR
+logger.maxZippedLogsSize=1G
+logger.interval=5MINUTE
+fproxy.enabled=@enablefproxy@
+fproxy.port=8888
+snmp.enabled=@enablesnmp@
+End
Deleted: trunk/apps/installer/installclasspath/config/node.conf
===================================================================
--- trunk/apps/installer/installclasspath/config/node.conf 2006-02-21
13:34:13 UTC (rev 8080)
+++ trunk/apps/installer/installclasspath/config/node.conf 2006-02-21
15:11:51 UTC (rev 8081)
@@ -1,9 +0,0 @@
-l33t=@l33t@
-password=@password@
-hostName=@hostname@
-portNumber=@portnumber@
-nodeName=@nodename@
-enableTestnet=@enabletestnet@
-enableSNMP=@enablesnmp@
-enableFCP=@enablefcp@
-enableFproxy=@enablefproxy@
