X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fconfiguration;h=e21933a1ad3415e434780f47bd125eb7e69682ea;hb=2eaef641f28551681c27f7990949352f6cbfeda9;hp=028831b3b4e5cf6eb435e9411dffcc2c7791342c;hpb=1d6788561694eab84c4de9c88bcc2646a24af02b;p=bootmanager.git

diff --git a/source/configuration b/source/configuration
index 028831b..e21933a 100644
--- a/source/configuration
+++ b/source/configuration
@@ -4,20 +4,34 @@
 
 
 # the current version of the bootmanager
-VERSION=3.1.7
-
+VERSION=3.2
 
+# this is the server to contact if we don't have a bootcd
+DEFAULT_BOOT_SERVER=boot.planet-lab.org
 # full url to which api server to contact
-BOOT_API_SERVER=https://www.planet-lab.org:443/PLCAPI/
+BOOT_API_SERVER=https://boot.planet-lab.org:443/PLCAPI/
+
+# keep redundant information to plc_config for simplicity
+BOOT_SERVER=boot.planet-lab.org
+
+# hostname for MyOps server
+MONITOR_SERVER=monitor.planet-lab.org
+#UPLOAD_LOG_SCRIPT=/monitor/upload
+UPLOAD_LOG_SCRIPT=/boot/upload-bmlog.php
+
+# bootcd variables : use %(path)s for path relative to bootcd
+BOOTCD_VERSION_FILE='%(path)s/bootme/ID'
+SERVER_CERT_DIR=/tmp/source/cacert
+CACERT_NAME=cacert.pem
 
 
 # path to store temporary files during the install,
 # do not include trailing slashes
-TEMP_PATH=/mnt/tmp
+TEMP_PATH=/tmp/mnt
 
 
 # path to the system mount point
-SYSIMG_PATH=/mnt/tmp/sysimg
+SYSIMG_PATH=/tmp/mnt/sysimg
 
 
 # where the cacerts for the boot cd can be found
@@ -44,13 +58,18 @@ SUPPORT_FILE_DIR=/boot
 # this sets the size of the root logical volume,
 # after the root and swap has been created, remaining
 # goes to the vserver partition
-ROOT_SIZE=3G
+ROOT_SIZE=7G
 
 
 # override the swap size
 SWAP_SIZE=1G
 
 
+# in raw disk mode, the size of /vservers
+# if unset or -1, use the entire first disk
+VSERVERS_SIZE=-1
+
+
 # whether or not to skip hardware requirement check
 SKIP_HARDWARE_REQUIREMENT_CHECK=0
 
@@ -61,7 +80,7 @@ MINIMUM_MEMORY=511000
 
 # minimum block disk size in GB to be added to lvm.
 # if any block devices are smaller than this, they are ignored.
-MINIMUM_DISK_SIZE=5
+MINIMUM_DISK_SIZE=17
 
 
 # total minimum disk size in GB if all usable disks are below this
@@ -75,3 +94,7 @@ INSTALL_LANGS=en_US
 
 # number of auth failures before starting debug mode
 NUM_AUTH_FAILURES_BEFORE_DEBUG=2
+
+
+# location of file containing http/https proxy info, if needed
+PROXY_FILE=/etc/planetlab/http_proxy