From f7fe683ac2f538dc49ce16c82bad5b11f4eac52f Mon Sep 17 00:00:00 2001 From: stephen mahood Date: Mon, 23 Feb 2015 12:34:04 -0500 Subject: [PATCH] house keeping with fai.conf and added more to STREAM packages --- files/etc/fai/apt/sources.list/FAISERVER | 30 ++++++++++++++----- files/etc/fai/fai.conf/FAISERVER | 7 +++-- files/etc/fai/make-fai-nfsroot.conf/FAISERVER | 5 ++-- 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/files/etc/fai/apt/sources.list/FAISERVER b/files/etc/fai/apt/sources.list/FAISERVER index f3611af..b3d65ad 100644 --- 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 a8fe212..7a3eab6 100644 --- a/files/etc/fai/fai.conf/FAISERVER +++ b/files/etc/fai/fai.conf/FAISERVER @@ -7,7 +7,7 @@ # nfs:///$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 6908d18..0885f79 100644 --- 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: " " -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" + -- 2.25.1