# funkcija utrpa ispravan sources.list
create_sources_list () {
[ -f /etc/apt/sources.list -a ! -f /etc/apt/sources.list.cn3-upgrade ] && mv /etc/apt/sources.list /etc/apt/sources.list.cn3-upgrade
- cp /usr/share/carnet-upgrade/files/sources.list /etc/apt
+ cp /usr/share/carnet-upgrade/files/etc/apt/sources.list /etc/apt
notice "Novi sadrzaj datoteke /etc/apt/sources.list:
`cat /etc/apt/sources.list`"
# backup_slapd_db
backup_slapd_db () {
- local ldap_backup=/var/backup/slapcat.cn3-upgrade
+ local ldap_backup=/var/backups/slapcat.cn3-upgrade
if [ ! -f $ldap_backup ]; then
[ -x /etc/init.d/freeradius ] && /etc/init.d/freeradius stop || true
for file in "$@"; do
# backup changes
- if [ -f "$file" -a ! -f "$file.cn3-upgrade" ]; then
+ if [ -e "$file" -a ! -e "$file.cn3-upgrade" ]; then
mv "$file" "$file.cn3-upgrade"
fi
# install original
- cp "/usr/share/carnet/upgrade/files/$file" "$file"
+ cp "/usr/share/carnet-upgrade/files/$file" "$file"
done
}
# upgrade apache -> apache2
-install_apache2 () {
- # bugfix za apache2-cn postinst
+upgrade_apache () {
+ # bugfix for apache2-cn postinst
mkdir -p /etc/apache2
touch /etc/apache2/httpd.conf
pkgadd apache2 squirrelmail apache2-cn squirrelmail-cn
}
+# restore amavis init script
+restore_amavis_init () {
+ # remove diversion
+ if [ -L /etc/init.d/amavis -a -f /etc/init.d/amavis.amavisd-new ]; then
+ rm -f /etc/init.d/amavis
+ dpkg-divert --remove --package amavis-cn --rename /etc/init.d/amavis --quiet
+ fi
+}
+
# instaliraj zadnji freeradius; uvjeti u queue fileovima
install_freeradius () {
pkgadd --force-yes freeradius-cn freeradius=1.0.5-0 freeradius-ldap=1.0.5-0