Modifications : local/apt-configure

diff --git a/etc/local.sh b/etc/local.sh
index 9f334e1..fdf1766 100644 (file)
--- a/etc/local.sh
+++ b/etc/local.sh
@@ -82,11 +82,7 @@ readonly local_arch="amd64"
 readonly local_bridge="br-gresille"
 readonly local_ipv4="91.216.110.42" # NOTE: IPv4 publique assignée par Grésille
 readonly local_gateway="91.216.110.6" # NOTE: estran.grenode.net
-readonly local_lsb_name="wheezy"
- # NOTE: on part sur wheezy dès le début
- # dans l'idée de ne pas s'embêter avec
- # une migration squeeze -> wheezy dans deux mois ;
- # et parce qu'on juge wheezy « suffisamment stable ».
+readonly local_lsb_name="jessie"
 readonly local_mac="00:16:3E:E5:98:42" # NOTE: addresse MAC assignée par Grésille
 readonly local_netmask="255.255.255.192"
 

diff --git a/local/apt-configure b/local/apt-configure
index 0ab9ba3..8dc73fe 100755 (executable)
--- a/local/apt-configure
+++ b/local/apt-configure
@@ -3,11 +3,12 @@ tool=$(readlink -e "${0%/*}/..")
 . "$tool"/local/lib.sh
 
 sudo install -m 664 -o root -g root /dev/stdin /etc/apt/sources.list <<-EOF
-       deb http://ftp.rezopole.net/debian $local_lsb_name main
-       deb http://security.debian.org/ $local_lsb_name/updates main
+       deb http://ftp.rezopole.net/debian/ $local_lsb_name         main
+       deb http://security.debian.org/     $local_lsb_name/updates main
+       deb http://ftp.rezopole.net/debian/ ${local_lsb_name}-updates main
        EOF
 sudo install -m 664 -o root -g root /dev/stdin /etc/apt/sources.list.d/$local_lsb_name-backports.list <<-EOF
-       deb http://ftp.rezopole.net/debian $local_lsb_name-backports main
+       #deb http://ftp.rezopole.net/debian $local_lsb_name-backports main
        EOF
 sudo install -m 664 -o root -g root /dev/stdin /etc/apt/sources.list.d/odoo.list <<-EOF
        deb http://nightly.odoo.com/7.0/nightly/deb ./
@@ -17,9 +18,9 @@ sudo install -m 664 -o root -g root /dev/stdin /etc/apt/preferences <<-EOF
        Pin: release a=$local_lsb_name
        Pin-Priority: 200
        
-       Package: *
-       Pin: release a=$local_lsb_name-backports
-       Pin-Priority: 170
+       #Package: *
+       #Pin: release a=$local_lsb_name-backports
+       #Pin-Priority: 170
        EOF
 sudo apt-get update
 "$tool"/local/apt-get-install apticron