From: Valentin Vidic Date: Mon, 14 Jan 2008 15:13:29 +0000 (+0100) Subject: Removed unused functionality. X-Git-Tag: debian/4.0.1~70 X-Git-Url: http://ftp.carnet.hr/pub/carnet-debian/scm?a=commitdiff_plain;h=df6b014a9ea544d6b360580ee76163b77a88fe4b;p=carnet-upgrade.git Removed unused functionality. --- diff --git a/src/actions/apt.queue b/src/actions/apt.queue index 2ebce74..5ff786c 100644 --- a/src/actions/apt.queue +++ b/src/actions/apt.queue @@ -1,6 +1,4 @@ # last update: 2005-07-03 # # Konfiguracija apt-a -! pkg apt-cn pkgadd apt-cn # 2.1.6 -pkg apt-cn lt 2.1.1 pkgadd apt-cn # 2.1.6 -pkg apt-cn ge 2.1.1 sources_list # 2.1.7 update +true create_sources_list diff --git a/src/actions/main.queue b/src/actions/main.queue index c183379..51b32ff 100644 --- a/src/actions/main.queue +++ b/src/actions/main.queue @@ -7,11 +7,6 @@ true remove_bloat true comment_force_overwrite # ruzna opcija za dpkg pkg libpam-skey pkgrm libpam-skey pkg skey-cn pkgrm skey-cn -true fix_xinetd_conf # ima i post-upgrade provjeru -#pkg uw-imapd-ssl-cn post_upgrade pkgrm uw-imapd-ssl -pkg lynx-ssl-cn post_upgrade pkgadd lynx-cn -pkg apache fix_mod_ssl_include -[ -f /etc/webalizer.conf ] fix_webalizer_conf # ovo bi trebao biti zadnji post_upgrade - spremi popis # instaliranih servisa za koje cemo na kraju provjeriti da li rade. ! check_services check check_services preupgrade @@ -26,7 +21,6 @@ true upgrade_libc true install_keyrings pkg mrtg-cn post_upgrade pkgadd munin-cn pkg mrtg-cn pkgrm mrtg mrtg-cn # zamjenjeno sa munin -pkg postgrey pkgrm postgrey # problematican # popravi konfiguracije koje stvaraju probleme true restore_configs # konacno, instalacija novih paketa @@ -35,19 +29,12 @@ pkg apache-cn upgrade_apache pkg openldap-aai upgrade_openldap true upgrade first # neki paketi moraju rucno true upgrade second # neke pakete zelimo ranije -true dist_upgrade -true pkgadd apt-listchanges deborphan +true dist_upgrade # instaliraj ostatak +pkg postgrey pkgrm postgrey # problematican # i ostatak true debconf_priority reset -true add_group_proc # + restart oidentd ako treba -pkg raidtools2 fix_etc_default_raid2 -pkg proftpd fix_proftpd_conf # + restart ako treba -pkg aide-arms-client fix_aidexfer_conf -pkg sendmail-cn ge 2:8.13.1-2 fix_smtp_auth +true add_group_proc # za oidentd pkg kernel-cn dpkg-reconfigure kernel-cn -pkg sys-mon-cn dpkg-reconfigure sys-mon-cn -pkg amavisd-cn dpkg-reconfigure amavisd-cn # vise ne treba? -#true post_upgrade_do_deborphan # ovo bi trebalo biti predzadnje na popisu # - izvrsi sve uvjetne post_upgrade akcije true run_post_upgrade diff --git a/src/actions/new.queue b/src/actions/new.queue index 29a65f3..fbae4d9 100644 --- a/src/actions/new.queue +++ b/src/actions/new.queue @@ -5,14 +5,3 @@ # samo ispravke dodane nakon 2.1-1, bez instalacije nove funckionalnosti # uglavnom forsirani upgradei # -pkg carnet-tools-cn lt 2.3.1 pkgadd carnet-tools-cn # 2.1.6 -pkg sendmail-cn ge 2:8.13.1-2 fix_smtp_auth -pkg ntp-cn lt 2:4.2.0a-11 pkgadd ntp-cn # 2.1.4 -pkg apt-cn lt 2.1.1 pkgadd apt-cn # 2.1.6 -pkg apt-cn ge 2.1.1 sources_list # 2.1.7 update -pkg freeradius ge 2:0 && [ `dpkg --print-architecture` = sparc ] && \ - ! pkg freeradius-cn install_freeradius # 2.1.7 -pkg php4-cn lt 4:4.3.11-1 pkgadd php4-cn # 2.1.6 update -pkg iptables-cn lt 2:1.2.11-3 pkgadd iptables-cn # 2.1.6 -pkg aide-arms-client lt 1.04-1 pkgadd aide-arms-client # 2.1.6 -pkg gnupg lt 1.4.1-1 pkgadd gnupg # 2.1.7 diff --git a/src/actions/post_upgrade.queue b/src/actions/post_upgrade.queue index d0d4b9a..cf92613 100644 --- a/src/actions/post_upgrade.queue +++ b/src/actions/post_upgrade.queue @@ -9,24 +9,9 @@ # 2.1-1, tj. nije ih bilo u packages_first popisu a dist-upgrade ih nije # instalirao. To se mozda odnosi na ntp-cn, pa je za svaki slucaj dodan. -pkg getunix pkgrm getunix # obsolete -pkg getunix-cn pkgrm getunix-cn -pkg freeradius-cn lt 2:1.0.1-2 install_freeradius # forsirane verzije # fix 2.1.4 -pkg carnet-tools-cn lt 2.3.1 pkgadd carnet-tools-cn # 2.1.6 -pkg ntp-cn lt 2:4.2.0a-11 pkgadd ntp-cn # 2.1.4 -pkg iptables-cn lt 2:1.2.11-3 pkgadd iptables-cn # 2.1.6 -true pkgadd apt-listchanges apt-listchanges-cn deborphan -# i ostatak true debconf_priority reset true add_group_proc # + restart oidentd ako treba -pkg raidtools2 fix_etc_default_raid2 -pkg proftpd fix_proftpd_conf # + restart ako treba -pkg aide-arms-client fix_aidexfer_conf -pkg sendmail-cn ge 2:8.13.1-2 fix_smtp_auth pkg kernel-cn dpkg-reconfigure kernel-cn -pkg sys-mon-cn dpkg-reconfigure sys-mon-cn -pkg amavisd-cn dpkg-reconfigure amavisd-cn # vise ne treba? -#true post_upgrade_do_deborphan # ovo bi trebalo biti predzadnje na popisu # - izvrsi sve uvjetne post_upgrade akcije true run_post_upgrade diff --git a/src/actions/upgrade.queue b/src/actions/upgrade.queue index b3d778b..ed084db 100644 --- a/src/actions/upgrade.queue +++ b/src/actions/upgrade.queue @@ -6,27 +6,6 @@ # veci broj paketa koji se ne daju upgradeati s obicnim # apt-get upgrade se forsirano upgradea true check_services preupgrade # spremi stanje -pkg getunix pkgrm getunix # obsolete -pkg getunix-cn pkgrm getunix-cn ! debconf_priority check debconf_priority set # utisaj debconf -! pkg apt-cn pkgadd apt-cn # 2.1.6 -pkg apt-cn lt 2.1.1 pkgadd apt-cn # 2.1.6 -pkg apt-cn ge 2.1.1 sources_list # 2.1.7 update -pkg freeradius ge 2:0 && [ `dpkg --print-architecture` = sparc ] && \ - ! pkg freeradius-cn install_freeradius # 2.1.7 -pkg freeradius-cn lt 2:1.0.1-2 install_freeradius # forsirane verzije # fix 2.1.4 -pkg bind9-cn lt 2:9.2.3-2 pkgadd bind9-cn -pkg carnet-tools-cn lt 2.3.1 pkgadd carnet-tools-cn # 2.1.7 update -pkg php4-cn lt 4:4.3.11-1 pkgadd php4-cn # 2.1.6 update -pkg gcc-cn lt 2:3.3.3-1 pkgadd gcc-cn -pkg ntp-cn lt 2:4.2.0a-11 pkgadd ntp-cn # 2.1.4 -pkg iptables-cn lt 2:1.2.11-3 pkgadd iptables-cn # 2.1.6 -pkg aide-arms-client lt 1.04-1 pkgadd aide-arms-client # 2.1.6 -pkg gnupg lt 1.4.1-1 pkgadd gnupg # 2.1.7 -true pkgadd apt-listchanges apt-listchanges-cn deborphan # 2.1.4 true debconf_priority reset # vrati debconf -pkg raidtools2 fix_etc_default_raid2 -pkg proftpd fix_proftpd_conf # + restart ako treba -pkg aide-arms-client fix_aidexfer_conf -pkg sendmail-cn ge 2:8.13.1-2 fix_smtp_auth true check_services postupgrade # za svaki slucaj diff --git a/src/functions.sh b/src/functions.sh index ac21431..6ef62aa 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -327,7 +327,7 @@ add_group_proc () { log "groupadd -g 99 proc" # update oidentd so it uses the proc group - if [ -x /etc/init.d/oidentd -a -f /etc/default/oidentd ]; + if [ -x /etc/init.d/oidentd -a -f /etc/default/oidentd ]; then check_and_sed 'OIDENT_GROUP.*proc' 's/\(OIDENT_GROUP\).*/\1=proc/' \ /etc/default/oident && /etc/init.d/oidentd restart fi @@ -507,33 +507,6 @@ upgrade_openldap () { dpkg --configure -a # try postinst again } -# tentatively remove obsolete option in xinetd.conf -fix_xinetd_conf () { - if [ -f /etc/xinetd.conf ]; then - check_and_sed 'log_on_failure.*RECORD' \ - 's/\(log_on_failure.*\)RECORD/\1/g' \ - /etc/xinetd.conf || true - fi -} - -# temporarily disable mod_ssl.conf in apache so that upgrade works -fix_mod_ssl_include() { - if [ -f /etc/apache/mod_ssl.conf ]; then - check_and_sed '^Include /etc/apache/mod_ssl\.conf' \ - 's,\(^Include[ ][ ]*/etc/apache/mod_ssl\.conf\),#\1,' \ - /etc/apache/httpd.conf || true - fi -} - -fix_proftpd_conf() { - if [ -f /etc/proftpd.conf ]; then - check_and_sed '^LsDefaultOptions' \ - 's,^LsDefaultOptions,ListOptions,' \ - /etc/proftpd.conf || true - fi - [ -x /etc/init.d/proftpd ] && /etc/init.d/proftpd restart || true -} - # fix /etc/dpkg/dpkg.cfg comment_force_overwrite () { if [ -f /etc/dpkg/dpkg.cfg ]; then @@ -545,14 +518,6 @@ comment_force_overwrite () { fi } -fix_aidexfer_conf() { - if [ -f /etc/aide/aidexfer.conf ]; then - check_and_sed '/usr/local/lib/aidexfer' \ - 's,/usr/local/lib/aidexfer,/usr/share/aidexfer,' \ - /etc/aide/aidexfer.conf || true - fi -} - fix_issue () { cat > /etc/issue <] | -h | --help moze biti: - main izvrsava potpunu proceduru za upgrade sa CARNet Debian 2.x (sarge) - na CARNet Debian 3.x (etch) distribuciju. Ovo je pretpostavljena + na CARNet Debian 4.x (etch) distribuciju. Ovo je pretpostavljena vrijednost. - post_upgrade @@ -59,7 +59,7 @@ Koristenje: $(basename $0) [] | -h | --help nakon apt-get dist-upgrade. - etch - izvrsava akcije podobne za CARNet Debian 3.x (etch) instalaciju. + izvrsava akcije podobne za CARNet Debian 4.x (etch) instalaciju. - new izvrsava samo akcije koje su dodane u ovoj inacici.