Sve brisanje se događa u remove_bloat()

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 0d64400..ddf0ebb 100644 (file)
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -8,7 +8,8 @@ true                            check_upgrade
 true                           check_reboot
 pkg xserver-xorg               remove_x
 true                           remove_bloat
 true                           check_reboot
 pkg xserver-xorg               remove_x
 true                           remove_bloat

-true                           remove_cn_bloat
+###ne treba više, sve je strpano u remove_bloat
+###true                                remove_cn_bloat

 true                           apt_listchanges disable
 # ovo bi trebao biti zadnji post_upgrade - spremi popis
 # instaliranih servisa za koje cemo na kraju provjeriti da li rade.
 true                           apt_listchanges disable
 # ovo bi trebao biti zadnji post_upgrade - spremi popis
 # instaliranih servisa za koje cemo na kraju provjeriti da li rade.

@@ -53,7 +54,8 @@ pkg dhcp3-client              pkgadd isc-dhcp-client  # novi naziv za dhcp
 true                           remove_orphaned         # ocisti stare libove nakon sto su cn paketi nadogradjeni
 # i ostatak
 true                           add_group_proc          # za oidentd
 true                           remove_orphaned         # ocisti stare libove nakon sto su cn paketi nadogradjeni
 # i ostatak
 true                           add_group_proc          # za oidentd

-true                           enable_monit
+### nema monita-cn u ovom trenutku
+###true                                enable_monit

 true                           clean_old_kernels
 pkg kernel-cn                  dpkg-reconfigure kernel-cn
 true                           clean_initd_packages
 true                           clean_old_kernels
 pkg kernel-cn                  dpkg-reconfigure kernel-cn
 true                           clean_initd_packages

diff --git a/src/data.sh b/src/data.sh
index 049b9d4..1dbd388 100644 (file)
--- a/src/data.sh
+++ b/src/data.sh
@@ -66,17 +66,33 @@ 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)
 # 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
-nessus         libnessus2 nessus-cn
-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        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
-'
+#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
+#nessus                libnessus2 nessus-cn
+#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       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
+#'
+
+bloats='apache apache-cn gcc-2.95-cn 
+gcc-cn gcc-misc-cn nessus-cn 
+ntop-cn piwi-cn prelude-sensors-cn 
+prelude-manager-cn snort-cn snort-central-cn 
+squid-cn 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 monit-cn mutt-cn netcat-cn nmap-cn 
+ntop-cn openssl-cn php-apc-cn perl-cn procmail-cn proftpd-cn python-cn razor-cn screen-cn slrn-cn 
+strace-cn stunnel-cn sudo-cn sys-mon-cn tcpdump-cn telnet-ssl-cn 
+unace-cn vim-cn vsftpd-cn wget-cn wv-cn ytalk-cn zsh-cn'

 
 # CN services to offer for removal
 cn_bloats='
 
 # CN services to offer for removal
 cn_bloats='

diff --git a/src/functions.sh b/src/functions.sh
index d7f2e20..2b4d743 100644 (file)
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -168,6 +168,17 @@ remove_x() {
 }
 
 remove_bloat() {
 }
 
 remove_bloat() {

+### zelja 2023-07-06
+tempdelfile=$(mktemp /tmp/tempdelfile.XXXX)
+
+for a in $bloats; do echo apt-get -qq -y remove $a 2\> /dev/null ; done > $tempdelfile
+
+/bin/bash $tempdelfile
+rm $tempdelfile
+
+return 0
+
+

   local to_remove add_this i j n text to_show cmd tmpfile installed
   local update_selections pkgs_to_deselect pkgs_to_remove oldifs pkglist
   text="$msg_remove_bloat"
   local to_remove add_this i j n text to_show cmd tmpfile installed
   local update_selections pkgs_to_deselect pkgs_to_remove oldifs pkglist
   text="$msg_remove_bloat"

@@ -226,6 +237,9 @@ remove_bloat() {
 }
 
 remove_cn_bloat() {
 }
 
 remove_cn_bloat() {

+### Sve obrisano u remove_bloat()
+return 0
+

   local installed pkg cn_pkgs dialog_list selection cn_del to_del del_pkgs
 
   # get installed packages
   local installed pkg cn_pkgs dialog_list selection cn_del to_del del_pkgs
 
   # get installed packages

diff --git a/src/messages.sh b/src/messages.sh
index 871a2c5..00e39d6 100644 (file)
--- a/src/messages.sh
+++ b/src/messages.sh
@@ -13,11 +13,11 @@ Zelite li nastaviti?"
 
 msg_second_warning="
 
 
 msg_second_warning="
 

-Podsjecamo vas da prije ove skripte pokrenete 'apt update && apt upgrade'.  
-Preporucujemo i backup cijelog sustava, s posebnim naglaskom na instalirane  
+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.
 
 baze podataka poput MariaDB i PostgreSQL.
 

-Takodjer pazljivo procitajte dokumentaciju koja se nalazi na web adresi 
+Takodjer pazljivo procitajte dokumentaciju koja se nalazi na web adresi \

 http://sysportal.carnet.hr/system/files/carnet-upgrade-bullseye.pdf
 
 Zelite li nastaviti?"
 http://sysportal.carnet.hr/system/files/carnet-upgrade-bullseye.pdf
 
 Zelite li nastaviti?"