house keeping with fai.conf and added more to STREAM packages

diff --git a/files/etc/fai/apt/sources.list/FAISERVER b/files/etc/fai/apt/sources.list/FAISERVER
index f3611af11299f88e6b7ae395da1ba96aac50527b..b3d65ade2beabc0f0a8fb000d803f88ac1281f06 100644 (file)
--- a/files/etc/fai/apt/sources.list/FAISERVER
+++ b/files/etc/fai/apt/sources.list/FAISERVER
@@ -1,8 +1,22 @@
-# via local partial mirror (was mirror on fai-cd)
-deb http://faiserver/debian squeeze main
-#deb http://faiserver/debian squeeze/updates main
-#deb http://faiserver/debian-security squeeze/updates main contrib non-free
-
-# via approx
-deb http://faiserver:9999/debian squeeze main contrib non-free
-deb http://faiserver:9999/security squeeze/updates main contrib non-free
+# deb http://mirror.fsf.org/trisquel/ belenos main
+
+# deb http://mirror.fsf.org/trisquel/ belenos-updates main
+# deb http://archive.trisquel.info/trisquel belenos-security main
+
+# See http://trisquel.info/wiki/ for how to upgrade to
+# newer versions of the distribution.
+deb http://mirror.fsf.org/trisquel/ belenos main
+deb-src http://mirror.fsf.org/trisquel/ belenos main
+
+deb http://mirror.fsf.org/trisquel/ belenos-updates main
+deb-src http://mirror.fsf.org/trisquel/ belenos-updates main
+
+deb http://mirror.fsf.org/trisquel/ belenos-security main
+deb-src http://mirror.fsf.org/trisquel/ belenos-security main
+
+# Uncomment this lines to enable the backports optional repository
+deb http://mirror.fsf.org/trisquel/ belenos-backports main
+deb-src http://mirror.fsf.org/trisquel/ belenos-backports main
+
+
+

diff --git a/files/etc/fai/fai.conf/FAISERVER b/files/etc/fai/fai.conf/FAISERVER
index a8fe212813dc710b79eb4219d3d04bf370cea8f5..7a3eab650ab5c5aeae3c54fb0c20852c580ca0c3 100644 (file)
--- a/files/etc/fai/fai.conf/FAISERVER
+++ b/files/etc/fai/fai.conf/FAISERVER
@@ -7,7 +7,7 @@
 # nfs://<install server>/$FAI_CONFIGDIR
 # supported URL-types: nfs, file, cvs, cvs+ssh, svn+file, svn+http,
 # git, git+http, hg+http
-#FAI_CONFIG_SRC=nfs://yourservername/path/to/config/space
+FAI_CONFIG_SRC=git+ssh://git@vcs.fsf.org:fai-configs.git
 
 # LOGUSER: an account on the install server which saves all log-files
 # and which can change the kernel that is booted via network.
@@ -31,7 +31,8 @@ FAI_LOGPROTO=ssh
 # Do not change them unless you know what you are doing!
 
 # mount point where the mirror will be mounted
-MNTPOINT=/media/mirror
+MNTPOINT=/srv/fai/mirror
 
 # the local configuration directory on the install client
-FAI=/var/lib/fai/config
+FAI=/srv/fai/config
+

diff --git a/files/etc/fai/make-fai-nfsroot.conf/FAISERVER b/files/etc/fai/make-fai-nfsroot.conf/FAISERVER
index 6908d186bcbde141fa4cb7f09acaf1b5b5c46b8e..0885f7911e048f7e9c23e7aa00927cfaf9d375f1 100644 (file)
--- a/files/etc/fai/make-fai-nfsroot.conf/FAISERVER
+++ b/files/etc/fai/make-fai-nfsroot.conf/FAISERVER
@@ -16,7 +16,7 @@ FAI_CONFIGDIR=/srv/fai/config
 NFSROOT_ETC_HOSTS="192.168.1.250 faiserver"
 
 # Parameter for debootstrap: "<suite> <mirror>"
-FAI_DEBOOTSTRAP="squeeze http://faiserver:9999/debian"
+FAI_DEBOOTSTRAP="belenos http://mirror.fsf.org/trisquel"
 
 # the encrypted (with md5 or crypt) root password on all install clients during
 # installation process; used when log in via ssh; default pw is: fai
@@ -33,4 +33,5 @@ FAI_ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # following lines should be read only for most of you
 
-FAI_DEBOOTSTRAP_OPTS="--exclude=info"
+FAI_DEBOOTSTRAP_OPTS="--exclude=info,dhcp-client --include=aptitude"
+