Prve preinake

diff --git a/debian/templates b/debian/templates
index 27e7724..763342e 100644 (file)
--- a/debian/templates
+++ b/debian/templates
@@ -1,12 +1,12 @@
 Template: carnet-upgrade/short-instructions
 Type: note
-_Description: CARNET Debian 10 (buster) nadogradnja
+_Description: Nadogradnja na CARNET Debian 11 (bullseye)
  Instalirali ste paket carnet-upgrade za nadogradnju sa CARNET Debian
- 9 (stretch) na CARNET Debian 10 (buster).
+ 10 (buster) na CARNET Debian 11 (bullseye).
  .
  Prije pocetka nadogradnje napravite backup cijelog sustava i
  procitajte dokumentaciju u /usr/share/doc/carnet-upgrade/ ili na
- webu: http://sysportal.carnet.hr/system/files/carnet-upgrade-buster.pdf
+ webu: http://sysportal.carnet.hr/system/files/carnet-upgrade-bullseye.pdf
  .
  Ukoliko niste restartali posluzitelj nakon instalacije kernela,
  restartajte ga prije pokretanja nadogradnje. Ukoliko nemate barem 

diff --git a/src/data.sh b/src/data.sh
index 31bc775..049b9d4 100644 (file)
--- a/src/data.sh
+++ b/src/data.sh
@@ -1,5 +1,5 @@
 # Backup extension
-backup_ext=cn10-upgrade
+backup_ext=cn11-upgrade
 
 # carnet-upgrade aborts if these packages are not up to date
 # name         wanted version
@@ -32,7 +32,7 @@ webalizer-cn  1:2.23.08~cn1
 '
 
 # URL to use for checking the latest version of carnet-upgrade itself
-packages_uri='http://ftp.carnet.hr/carnet-debian/dists/carnet-buster/main/binary-i386/Packages'
+packages_uri='http://ftp.carnet.hr/carnet-debian/dists/carnet-bullseye/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.
@@ -42,32 +42,30 @@ postgresql-client unixodbc iptables oidentd libpam-modules procps base-passwd if
 
 # Packages that provide crucial services, upgrade them before the rest
 packages_second='
-amavisd-cn
-amavis-stats-cn
+amavisd-new
 aosi-aai
 aosi-www-aai
-bind9-cn bind9
-clamav-cn clamav-daemon
-dovecot-cn
+bind9
+clamav-daemon
+dovecot-core
 freeradius-aai freeradius
 isc-dhcp-client
-kernel-cn
-monit-cn
-munin-cn
-mariadb-cn mariadb-client mariadb-server
-ntp-cn
+monit
+munin
+mariadb-client mariadb-server
+ntp
 openldap-aai
-openssh-cn openssh-server openssh-client ssh
-ossec-hids-cn
-postfix-cn
-spamassassin-cn        spamassassin razor
-vsftpd-cn
-webalizer-cn
-xinetd-cn xinetd       
+openssh-server openssh-client ssh
+postfix
+spamassassin
+vsftpd
+webalizer
+xinetd 
 '
 
 # We want to remove these packages, used in remove_bloat()
 # nice name            packages to remove
+# Dodani su svi CN paketi osim bacula-cn i carnet-tools-cn (2023-07-06)
 bloats='
 apache         apache apache-cn
 gobjc gpc gcj gij chill g77            gcc-2.95-cn gcc-cn gcc-misc-cn gobjc gpc gcj gij chill g77
@@ -76,9 +74,10 @@ ntop         ntop ntop-cn
 prelude piwi   piwi piwi-cn libprelude0 prelude-sensors-cn prelude-manager-cn prelude-manager
 snort          snort snort-cn snort-central-cn
 squid          squid squid-cn
-stari CN paketi        autoconf-cn automake-cn bison-cn bitchx-cn chkrootkit-cn cvs-cn diff-cn elinks-cn expect-cn file-cn flex-cn gawk-cn gdb-cn gettext-cn gnupg-cn grep-cn iptraf-cn jed-cn joe-cn less-cn lftp-cn logcheck-cn logrotate-cn lsof-cn ltrace-cn lynx-cn make-cn mutt-cn netcat-cn nmap-cn ntop-cn openssl-cn perl-cn procmail-cn python-cn razor-cn screen-cn slrn-cn strace-cn stunnel-cn sudo-cn sys-mon-cn tcpdump-cn telnet-ssl-cn telnetd-ssl unace-cn vim-cn wget-cn wv-cn ytalk-cn zsh-cn
+stari CN paketi        aide-cn alpine-cn amavisd-cn apache2-cn apt-cn bind9-cn clamav-cn dovecot-cn fail2ban-cn iptables-cn kernel-source-cn mailman-cn munin-cn mysql-cn ntp-cn ocsinventory-agent-cn oidentd-cn openssh-cn php7.3-cn postfix-cn roundcube-cn samba-cn spamassassin-cn sysadmin-cn vsftpd-cn xinetd-cn autoconf-cn automake-cn bison-cn bitchx-cn chkrootkit-cn cvs-cn diff-cn elinks-cn expect-cn file-cn flex-cn gawk-cn gdb-cn gettext-cn gnupg-cn grep-cn iptraf-cn jed-cn joe-cn less-cn lftp-cn logcheck-cn logrotate-cn lsof-cn ltrace-cn lynx-cn make-cn mutt-cn netcat-cn nmap-cn ntop-cn openssl-cn perl-cn procmail-cn python-cn razor-cn screen-cn slrn-cn strace-cn stunnel-cn sudo-cn sys-mon-cn tcpdump-cn telnet-ssl-cn telnetd-ssl unace-cn vim-cn wget-cn wv-cn ytalk-cn zsh-cn
 usbmgr         usbmgr
 '
+
 # CN services to offer for removal
 cn_bloats='
 aide-cn aide-central-cn aide
@@ -116,34 +115,32 @@ libdb4.6
 '
 
 # new packages to be installed
+###ocsinventory-agent-cn
 new_packages='
-ocsinventory-agent-cn
 mlocate
 '
 
 # Check if these services are running after upgrade
 # package-cn           user            proces (pazi, regexp)                   nice name
 services_to_check='
-amavisd-cn             amavis          /usr/sbin/amavisd-new [(]master[)]      Amavis
+amavisd-new            amavis          /usr/sbin/amavisd-new [(]master[)]      Amavis
 aosi-aai               aosi            /usr/sbin/aosi                          AOSI
-apache2-cn             www-data        /usr/sbin/apache2                       Apache2
-bind9-cn               bind            /usr/sbin/named                         Bind
-clamav-cn              clamav          /usr/bin/freshclam                      ClamAV update
-clamav-cn              clamav          /usr/sbin/clamd                         ClamAV
-dovecot-cn             root            /usr/sbin/dovecot                       Dovecot
+apache2                        www-data        /usr/sbin/apache2                       Apache2
+bind9                  bind            /usr/sbin/named                         Bind
+clamav-freshclam       clamav          /usr/bin/freshclam                      ClamAV update
+clamav-daemon          clamav          /usr/sbin/clamd                         ClamAV
+dovecot-core           root            /usr/sbin/dovecot                       Dovecot
 freeradius-aai         freerad         /usr/sbin/freeradius                    FreeRADIUS
-mailman-cn             list            /usr/lib/mailman/bin/mailmanctl         Mailman
-monit-cn               root            /usr/bin/monit                          Monit
-munin-cn               root            munin-node                              Munin
-mariadb-cn             mysql           /usr/sbin/mysqld                        MariaDB
-ntp-cn                 ntp             /usr/sbin/ntpd                          NTP
-oidentd-cn             oident          /usr/sbin/oidentd                       oidentd
+mailman                        list            /usr/lib/mailman/bin/mailmanctl         Mailman
+monit                  root            /usr/bin/monit                          Monit
+munin                  root            munin-node                              Munin
+mariadb-server-core-10.5       mysql           /usr/sbin/mysqld                        MariaDB
+ntp                    ntp             /usr/sbin/ntpd                          NTP
+oidentd                        oident          /usr/sbin/oidentd                       oidentd
 openldap-aai           openldap        /usr/sbin/slapd                         OpenLDAP
-openssh-cn             root            /usr/sbin/sshd                          OpenSSH
-ossec-hids-cn          ossecm          /var/ossec/bin/ossec                    OSSec
-postfix-cn             root            /usr/lib/postfix/sbin/master            Postfix
-postfix-cn             root            /usr/sbin/saslauthd                     SASL authentication
-samba-cn               root            /usr/sbin/smbd                          Samba
-vsftpd-cn              root            /usr/sbin/vsftpd                        VSFTPD
-xinetd-cn              root            /usr/sbin/xinetd                        xinetd
+openssh-server         root            /usr/sbin/sshd                          OpenSSH
+postfix                        root            /usr/lib/postfix/sbin/master            Postfix
+sasl2-bin              root            /usr/sbin/saslauthd                     SASL authentication
+vsftpd                 root            /usr/sbin/vsftpd                        VSFTPD
+xinetd                 root            /usr/sbin/xinetd                        xinetd
 '

diff --git a/src/functions.sh b/src/functions.sh
index 427e1a4..f198f62 100644 (file)
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -2,8 +2,8 @@
 # Zoran 'jelly' Dzelajlija <jelly@srce.hr>
 # Zeljko Boros <zelja@carnet.hr>
 
-PHPVER="7.3"
-MDB="10.3"
+PHPVER="7.4"
+MDB="10.5"
 PINFILE="/etc/apt/preferences.d/99-carnet"
 
 
@@ -344,7 +344,7 @@ Doslo je do greske prilikom izvrsavanja akcije '$action'. Detalje problema moguc
 Da bi dovrsili zapocete operacije nad paketima pokrenite:
 
   # dpkg --configure -a
-  # apt-get -f install
+  # apt -f install
 
 Nakon toga ponovno pozovite carnet-upgrade skriptu."
 }
@@ -373,7 +373,7 @@ check_upgrade () {
 
   if [ "$upgrade" ]; then
     notice "
-Prije prelaska na Debian stretch potrebno je napraviti nadogradnju ovih paketa:
+Prije prelaska na Debian bullseye potrebno je napraviti nadogradnju ovih paketa:
   $upgrade
 
 Pokrenite:

diff --git a/src/messages.sh b/src/messages.sh
index e5386d4..12aa0d0 100644 (file)
--- a/src/messages.sh
+++ b/src/messages.sh
@@ -1,17 +1,20 @@
 ###
 # dialog stuff
-title="Nadogradnja CARNET Debian stretch -> buster"
+title="Nadogradnja CARNET Debian buster -> bullseye"
 
 msg_first_warning="PAZNJA! PAZNJA!
 
-Pokrenuli ste proceduru nadogradnje CARNET Debian distribucije. Podsjecamo \
-Vas da prije ove skripte svakako pokrenete 'apt full-upgrade'. Strogo \
-preporucujemo i backup cijelog sustava, s posebnim naglaskom na instalirane \
+OVA NADOGRADNJA JE POSLJEDNJA CARNETOVA NADOGRADNJA ZA DEBIAN.  UPORABOM OVE \
+SKRIPTE OBRISAT CE SE SVI CARNETOVI PAKETI SA SUSTAVA!  MODIFIKACIJE KOJE \
+SU CN PAKETI NAPRAVILI CE OSTATI, A BUDUCE NADOGRADNJE CETE MOCI NAPRAVITI \
+PUTEM STANDARDNOG DEBIANOVOG MEHANIZMA ZA NADOGRADNJE.
+
+Podsjecamo vas da prije ove skripte pokrenete 'apt update && apt upgrade'. \ 
+Preporucujemo i backup cijelog sustava, s posebnim naglaskom na instalirane \ 
 baze podataka poput MariaDB i PostgreSQL.
 
-Takodjer pazljivo procitajte dokumentaciju koja se nalazi u \
-/usr/share/doc/carnet-upgrade/ ili na web adresi \
-http://sysportal.carnet.hr/system/files/carnet-upgrade.pdf
+Takodjer pazljivo procitajte dokumentaciju koja se nalazi na web adresi 
+http://sysportal.carnet.hr/system/files/carnet-upgrade-bullseye.pdf
 
 Zelite li nastaviti?"
 
@@ -91,8 +94,8 @@ Koristenje: $(basename $0) [<akcija>] | -h | --help
 
 <akcija> moze biti:
   - main 
-         izvrsava potpunu proceduru za nadogradnju sa CARNET Debian 9 (stretch)
-         na CARNET Debian 10 (buster) distribuciju.  Ovo je pretpostavljena
+         izvrsava potpunu proceduru za nadogradnju sa CARNET Debian 10 (buster)
+         na CARNET Debian 11 (bullseye) distribuciju.  Ovo je pretpostavljena
          vrijednost.
          
   - post_upgrade