Rename jessie -> stretch.

diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 599cc53..4e3bd7c 100644 (file)
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -20,15 +20,15 @@ msgstr ""
 #. Type: note
 #. Description
 #: ../templates:1001
-msgid "CARNet Debian 8 (jessie) nadogradnja"
+msgid "CARNet Debian 9 (stretch) nadogradnja"
 msgstr ""
 
 #. Type: note
 #. Description
 #: ../templates:1001
 msgid ""
-"Instalirali ste paket carnet-upgrade za nadogradnju sa CARNet Debian 7 "
-"(wheezy) na CARNet Debian 8 (jessie)."
+"Instalirali ste paket carnet-upgrade za nadogradnju sa CARNet Debian 8 "
+"(jessie) na CARNet Debian 9 (stretch)."
 msgstr ""
 
 #. Type: note

diff --git a/debian/templates b/debian/templates
index aeacace..72c0919 100644 (file)
--- a/debian/templates
+++ b/debian/templates
@@ -1,8 +1,8 @@
 Template: carnet-upgrade/short-instructions
 Type: note
-_Description: CARNet Debian 8 (jessie) nadogradnja
+_Description: CARNet Debian 9 (stretch) nadogradnja
  Instalirali ste paket carnet-upgrade za nadogradnju sa CARNet Debian
- 7 (wheezy) na CARNet Debian 8 (jessie).
+ 8 (jessie) na CARNet Debian 9 (stretch).
  .
  Prije pocetka nadogradnje napravite backup cijelog sustava i
  procitajte dokumentaciju u /usr/share/doc/carnet-upgrade/ ili na

diff --git a/doc/README b/doc/README
index d381a15..fbc8808 100644 (file)
--- a/doc/README
+++ b/doc/README
@@ -4,9 +4,9 @@ Ovaj paket donosi skriptu za nadogradnju posluzitelja pod operativnim
 sustavom Debian na ustanovama clanicama CARNeta. Debian je jedna od
 najpopularnijih distribucija operativnog sustava Linux.
 
-Skripta carnet-upgrade omogucava prijelaz s CARNet-Debiana 7.x na
-CARNet-Debian 8.x i nadogradnju postavki na postojecim instalacijama 
-CARNet-Debiana 8.x.
+Skripta carnet-upgrade omogucava prijelaz s CARNet-Debiana 8.x na
+CARNet-Debian 9.x i nadogradnju postavki na postojecim instalacijama
+CARNet-Debiana 9.x.
 
 Dokumentacija za nadogradnju se nalazi u ovom direktoriju pod nazivom
 "carnet-upgrade.pdf".

diff --git a/doc/carnet-upgrade-src.sgml b/doc/carnet-upgrade-src.sgml
index 3e0cac4..0432feb 100644 (file)
--- a/doc/carnet-upgrade-src.sgml
+++ b/doc/carnet-upgrade-src.sgml
@@ -3,7 +3,7 @@
   <book>
 
     <titlepag>
-      <title>CARNet Debian 8 (jessie) nadogradnja</title>
+      <title>CARNet Debian 9 (stretch) nadogradnja</title>
       <author>
         <name>Grupa za izradu paketa</name>
         <email>paketi@carnet.hr</email>
@@ -11,16 +11,16 @@
       <version>Verzija %PKG_VERSION%</version>
 
       <abstract>
-        CARNet Debian <em>jessie</em> je sedma generacija CARNet Debian
-        distribucije i temelji se na Debian GNU/Linux <em>jessie</em>.
+        CARNet Debian <em>stretch</em> je osma generacija CARNet Debian
+        distribucije i temelji se na Debian GNU/Linux <em>stretch</em>.
         Ovaj priručnik opisuje postupak nadogradnje CARNet Debian
-        distribucije sa inačice 7 <em>wheezy</em> na inačicu 8
-        <em>jessie</em>.  Priručnik je zamišljen kao pomoć CARNetovim
+        distribucije sa inačice 8 <em>jessie</em> na inačicu 9
+        <em>stretch</em>.  Priručnik je zamišljen kao pomoć CARNetovim
         sistem inženjerima koji na svojim poslužiteljima imaju instaliran
         CARNet Debian i trebao bi obuhvatiti cjelokupan postupak
         nadogradnje, kao i tipične probleme na koje se može naići. Za tu
         svrhu pripremili smo paket <package>carnet-upgrade</package> inačice
-        8, koji se nalazi na CARNetovom FTP poslužitelju u <em>wheezy</em>
+        9, koji se nalazi na CARNetovom FTP poslužitelju u <em>jessie</em>
         repozitoriju paketa.
       </abstract>
     </titlepag>
@@ -133,8 +133,8 @@
       <sect>
         <heading>Prije početka</heading>
         <p>
-        Prije nadogradnje na <em>jessie</em> distribuciju, potrebno je
-        izvršiti nadogradnju <em>wheezy</em> distribucije na najsvježije
+        Prije nadogradnje na <em>stretch</em> distribuciju, potrebno je
+        izvršiti nadogradnju <em>jessie</em> distribucije na najsvježije
         pakete. To se najjednostavnije izvodi naredbom <prgn>apt-get</prgn>:
 
 <example>
@@ -167,12 +167,12 @@
         <file>/etc/apt/sources.list</file> datoteci:
 
 <example>
-deb http://ftp.carnet.hr/carnet-debian carnet-wheezy main non-free
+deb http://ftp.carnet.hr/carnet-debian carnet-jessie main non-free
 </example>
         </p>
 
         <p>
-        To je uobičajena konfiguracija CARNet Debian <em>wheezy</em>
+        To je uobičajena konfiguracija CARNet Debian <em>jessie</em>
         repozitorija. Ako tog retka nema, dodajte ga i ponovite
         postupak instalacije <package>carnet-upgrade</package> paketa.
         </p>
@@ -198,7 +198,7 @@ CN: run_actions (main) started...
 
 <example>
 +-----------------------------------------------------------------+
-| Nadogradnja CARNet Debian wheezy -> jessie                      |
+| Nadogradnja CARNet Debian jessie -> stretch                     |
 +-----------------------------------------------------------------+
 | PAZNJA! PAZNJA!                                                 |
 |                                                                 |
@@ -222,16 +222,16 @@ CN: run_actions (main) started...
 
         <p>
         U sljedećem koraku biti će izvršena provjera jesu li najvažniji
-        servisi nadograđeni na najnovije inačice u <em>wheezy</em>
+        servisi nadograđeni na najnovije inačice u <em>jessie</em>
         distribuciji.  Ako neki od instaliranih servisa nije najnovija
         inačica, pojavit će se poruka:
 
 <example>
 +-----------------------------------------------------------------+
-| Nadogradnja CARNet Debian wheezy -> jessie                      |
+| Nadogradnja CARNet Debian jessie -> stretch                     |
 +-----------------------------------------------------------------+
 |                                                                 |
-| Prije prelaska na Debian jessie potrebno je napraviti           |
+| Prije prelaska na Debian stretch potrebno je napraviti          |
 | nadogradnju ovih paketa:                                        |
 |    amavisd-cn                                                   |
 |                                                                 |
@@ -263,7 +263,7 @@ CN: run_actions (main) started...
 
 <example>
 +-----------------------------------------------------------------+
-| Nadogradnja CARNet Debian wheezy -> jessie                      |
+| Nadogradnja CARNet Debian jessie -> stretch                     |
 +-----------------------------------------------------------------+
 |                                                                 |
 | Na racunalu je pronadjenja verzija kernela novija od trenutno   |
@@ -285,7 +285,7 @@ CN: run_actions (main) started...
 
 <example>
 +-----------------------------------------------------------------+
-| Nadogradnja CARNet Debian wheezy -> jessie                      |
+| Nadogradnja CARNet Debian jessie -> stretch                     |
 +-----------------------------------------------------------------+
 |                                                                 |
 | Na racunalu je pronadjena instalacija KDE, GNOME ili X Window   |
@@ -312,7 +312,7 @@ CN: run_actions (main) started...
 
 <example>
 +-----------------------------------------------------------------+
-| Nadogradnja CARNet Debian wheezy -> jessie                      |
+| Nadogradnja CARNet Debian jessie -> stretch                     |
 +-----------------------------------------------------------------+
 | Prethodna inacica distribucije, CARNet Debian 6, donosila je    |
 | neke pakete koji nisu nuzni za normalan rad posluzitelja.       |
@@ -340,7 +340,7 @@ CN: run_actions (main) started...
 
 <example>
 +-----------------------------------------------------------------+
-| Nadogradnja CARNet Debian wheezy -> jessie                      |
+| Nadogradnja CARNet Debian jessie -> stretch                     |
 +-----------------------------------------------------------------+
 | Standardna instalacija CARNet Debian distribucije donosi        |
 | podrsku za veci broj razlicitih servisa. U ovom koraku nudi     |
@@ -374,9 +374,9 @@ CN: run_actions (main) started...
 
 <example>
 +-----------------------------------------------------------------+
-| Nadogradnja CARNet Debian wheezy -> jessie                      |
+| Nadogradnja CARNet Debian jessie -> stretch                     |
 +-----------------------------------------------------------------+
-| Napravljen backup slapd baze u /var/backups/slapcat.cn8-upgrade.|
+| Napravljen backup slapd baze u /var/backups/slapcat.cn9-upgrade.|
 |                                                                 |
 |                                                                 |
 |                                                                 |
@@ -400,10 +400,10 @@ CN: run_actions (main) started...
         
 <example>
 +-----------------------------------------------------------------+
-| Nadogradnja CARNet Debian wheezy -> jessie                      |
+| Nadogradnja CARNet Debian jessie -> stretch                     |
 +-----------------------------------------------------------------+
 | Napravljen backup /etc direktorija u                            |
-| /var/backups/etc.cn8-upgrade.tar.gz.                            |
+| /var/backups/etc.cn9-upgrade.tar.gz.                            |
 |                                                                 |
 |                                                                 |
 |                                                                 |
@@ -420,27 +420,27 @@ CN: run_actions (main) started...
 
         <p>
         Slijedi instalacija <file>/etc/apt/sources.list</file> datoteke
-        podešene za CARNet Debian <em>jessie</em> i osvježavanje baze paketa.
+        podešene za CARNet Debian <em>stretch</em> i osvježavanje baze paketa.
         Eventualne dodatne repozitorije nakon nadogradnje možete kopirati iz
         stare <file>sources.list</file> datoteke, koja će biti spremljena
-        kao <file>/etc/apt/sources.list.cn8-upgrade</file>.
+        kao <file>/etc/apt/sources.list.cn9-upgrade</file>.
 
 <example>
 +-----------------------------------------------------------------+
-| Nadogradnja CARNet Debian wheezy -> jessie                      |
+| Nadogradnja CARNet Debian jessie -> stretch                     |
 +-----------------------------------------------------------------+
 | Novi sadrzaj datoteke /etc/apt/sources.list:                    |
 |                                                                 |
 | # See sources.list(5) for more information                      |
-| deb http://ftp.hr.debian.org/debian/ jessie main contrib non-fre|
-| deb http://ftp.hr.debian.org/debian/ jessie-updates main contrib|
-| deb http://security.debian.org/ jessie/updates main contrib non-|
+| deb http://ftp.hr.debian.org/debian/ stretch main contrib non-fr|
+| deb http://ftp.hr.debian.org/debian/ stretch-updates main contri|
+| deb http://security.debian.org/ stretch/updates main contrib non|
 |                                                                 |
 | # CARNet Debian Linux                                           |
-| deb http://ftp.carnet.hr/carnet-debian/ carnet-jessie main non-f|
+| deb http://ftp.carnet.hr/carnet-debian/ carnet-stretch main non-|
 |                                                                 |
 | # SRCE AAI@EduHr                                                |
-| deb http://ftp.srce.hr/srce-debian/ srce-jessie main            |
+| deb http://ftp.srce.hr/srce-debian/ srce-stretch main           |
 |                                                                 |
 +-----------------------------------------------------------------+
 |                           < U redu >                            |
@@ -519,7 +519,7 @@ CN: run_actions (main) started...
 
 <example>
 +-----------------------------------------------------------------+
-| Nadogradnja CARNet Debian wheezy -> jessie                      |
+| Nadogradnja CARNet Debian jessie -> stretch                     |
 +-----------------------------------------------------------------+
 | Automatizirane ispravke su izvrsene. Provjerite jesu li svi     |
 | vasi kriticni servisi ispravno konfigurirani i pokrenuti.       |

diff --git a/files/etc/apt/sources.list.template b/files/etc/apt/sources.list.template
index 3926edd..f15b2f8 100644 (file)
--- a/files/etc/apt/sources.list.template
+++ b/files/etc/apt/sources.list.template
@@ -1,17 +1,17 @@
 # See sources.list(5) for more information
-deb http://ftp.hr.debian.org/debian/ jessie main contrib non-free
-deb http://ftp.hr.debian.org/debian/ jessie-updates main contrib non-free
-deb http://security.debian.org/ jessie/updates main contrib non-free
+deb http://ftp.hr.debian.org/debian/ stretch main contrib non-free
+deb http://ftp.hr.debian.org/debian/ stretch-updates main contrib non-free
+deb http://security.debian.org/ stretch/updates main contrib non-free
 
 # CARNet Debian Linux
-deb http://ftp.carnet.hr/carnet-debian/ carnet-jessie main non-free
+deb http://ftp.carnet.hr/carnet-debian/ carnet-stretch main non-free
 
 # SRCE AAI@EduHr
-deb http://ftp.srce.hr/srce-debian/ srce-jessie main
+deb http://ftp.srce.hr/srce-debian/ srce-stretch main
 
 # Uncomment if you want the apt-get source function to work
-#deb-src http://ftp.hr.debian.org/debian/ jessie main contrib non-free
-#deb-src http://ftp.hr.debian.org/debian/ jessie-updates main contrib non-free
-#deb-src http://security.debian.org/ jessie/updates main contrib non-free
-#deb-src http://ftp.carnet.hr/carnet-debian/ carnet-jessie main non-free
-#deb-src http://ftp.srce.hr/srce-debian/ srce-jessie main
+#deb-src http://ftp.hr.debian.org/debian/ stretch main contrib non-free
+#deb-src http://ftp.hr.debian.org/debian/ stretch-updates main contrib non-free
+#deb-src http://security.debian.org/ stretch/updates main contrib non-free
+#deb-src http://ftp.carnet.hr/carnet-debian/ carnet-stretch main non-free
+#deb-src http://ftp.srce.hr/srce-debian/ srce-stretch main

diff --git a/src/data.sh b/src/data.sh
index f71ba07..cd99d89 100644 (file)
--- a/src/data.sh
+++ b/src/data.sh
@@ -1,5 +1,5 @@
 # Backup extension
-backup_ext=cn8-upgrade
+backup_ext=cn9-upgrade
 
 # carnet-upgrade aborts if these packages are not up to date
 # name         wanted version
@@ -11,7 +11,7 @@ apache2-cn    2.2+3
 bind9-cn       2:9.7.3
 carnet-tools-cn        3.0.3
 clamav-cn      3:0.97.8-1
-debian-archive-keyring 2014.3~deb7u1
+debian-archive-keyring 2017.5~deb8u1
 dovecot-cn     1:1.2.15.3
 fail2ban-cn    0.8.5
 freeradius-aai 2.1.10-2
@@ -36,7 +36,7 @@ webalizer-cn  2.01.10+2
 '
 
 # URL to use for checking the latest version of carnet-upgrade itself
-packages_uri='http://ftp.carnet.hr/carnet-debian/dists/carnet-jessie/main/binary-i386/Packages'
+packages_uri='http://ftp.carnet.hr/carnet-debian/dists/carnet-stretch/main/binary-i386/Packages'
 
 # Packages to forcibly install before installing the rest with dist-upgrade,
 # because dist-upgrade would rather remove or keep them back them.

diff --git a/src/functions.sh b/src/functions.sh
index 2dde2af..4a5de69 100644 (file)
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -367,7 +367,7 @@ check_upgrade () {
 
   if [ "$upgrade" ]; then
     notice "
-Prije prelaska na Debian jessie potrebno je napraviti nadogradnju ovih paketa:
+Prije prelaska na Debian stretch potrebno je napraviti nadogradnju ovih paketa:
   $upgrade
 
 Pokrenite:

diff --git a/src/messages.sh b/src/messages.sh
index 65e58ca..6e04fff 100644 (file)
--- a/src/messages.sh
+++ b/src/messages.sh
@@ -1,6 +1,6 @@
 ###
 # dialog stuff
-title="Nadogradnja CARNet Debian wheezy -> jessie"
+title="Nadogradnja CARNet Debian jessie -> stretch"
 
 msg_first_warning="PAZNJA! PAZNJA!
 
@@ -91,8 +91,8 @@ Koristenje: $(basename $0) [<akcija>] | -h | --help
 
 <akcija> moze biti:
   - main 
-         izvrsava potpunu proceduru za nadogradnju sa CARNet Debian 7 (wheezy)
-         na CARNet Debian 8 (jessie) distribuciju.  Ovo je pretpostavljena
+         izvrsava potpunu proceduru za nadogradnju sa CARNet Debian 8 (jessie)
+         na CARNet Debian 9 (stretch) distribuciju.  Ovo je pretpostavljena
          vrijednost.
          
   - post_upgrade