X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fconfiguration;h=cabf1893cd85fb12ed5ea43130963a473d154fc4;hb=d12ade7dd98cccdea3b1d3bfc3e65893de2390b0;hp=152cc759aeb7ca474f0f39221e5316fe7fed0f3b;hpb=ac33037abb3b028c7e57010d1e85216fe11ea6c1;p=bootmanager.git

diff --git a/source/configuration b/source/configuration
index 152cc75..cabf189 100644
--- a/source/configuration
+++ b/source/configuration
@@ -4,12 +4,26 @@
 
 
 # the current version of the bootmanager
-VERSION=3.2
-
+VERSION=5.3
 
+# 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://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} for path relative to bootcd
+BOOTCD_VERSION_FILE='{path}/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
@@ -36,19 +50,15 @@ NONCE_FILE=/tmp/nonce
 PLCONF_DIR=/etc/planetlab
 
 
-# directory on the boot server containing
-# support files and scripts
-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=7G
+vs_ROOT_SIZE=14G
+lxc_ROOT_SIZE=12G
 
 
 # override the swap size
-SWAP_SIZE=1G
+SWAP_SIZE=4G
 
 
 # in raw disk mode, the size of /vservers
@@ -71,7 +81,8 @@ MINIMUM_DISK_SIZE=17
 
 # total minimum disk size in GB if all usable disks are below this
 # size, the node cannot be installed
-TOTAL_MINIMUM_DISK_SIZE=50
+vs_TOTAL_MINIMUM_DISK_SIZE=50
+lxc_TOTAL_MINIMUM_DISK_SIZE=50
 
 
 # set of langugase for install (used in /etc/rpm/macros)
@@ -80,3 +91,9 @@ 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
+
+ONE_PARTITION=0