Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 2664 → Rev 2662

/scripts/alcasar-migrations/alcasar-migration-3.3.0_dbRadiusAttrs.sh
File deleted
Property changes:
Deleted: svn:eol-style
-LF
\ No newline at end of property
Deleted: svn:executable
-*
\ No newline at end of property
Deleted: svn:keywords
-Id
\ No newline at end of property
/scripts/alcasar-migrations/alcasar-migration-3.3.1_dbRadiusAttrs.sh
File deleted
Property changes:
Deleted: svn:eol-style
-LF
\ No newline at end of property
Deleted: svn:executable
-*
\ No newline at end of property
Deleted: svn:keywords
-Id
\ No newline at end of property
/scripts/alcasar-migrations/alcasar-migration-3.2.0_dbStructure.sh
File deleted
Property changes:
Deleted: svn:eol-style
-LF
\ No newline at end of property
Deleted: svn:executable
-*
\ No newline at end of property
Deleted: svn:keywords
-Id
\ No newline at end of property
/scripts/alcasar-conf.sh
31,6 → 31,9
LDAP_mode=`grep ^LDAP= $CONF_FILE|cut -d"=" -f2`
HOSTNAME=`grep ^HOSTNAME= $CONF_FILE|cut -d"=" -f2`
DOMAIN=`grep ^DOMAIN= $CONF_FILE|cut -d"=" -f2`
PASSWD_FILE="/root/ALCASAR-passwords.txt"
DB_USER=$(grep '^db_user=' $PASSWD_FILE | cut -d'=' -f 2-)
DB_PASS=$(grep '^db_password=' $PASSWD_FILE | cut -d'=' -f 2-)
SED="/bin/sed -i"
DNS1=`grep ^DNS1= $CONF_FILE | cut -d'=' -f2` # server DNS1 (for WL domain names)
DOMAIN=${DOMAIN:=localdomain}
70,7 → 73,11
[ -d $DIR_UPDATE ] && rm -rf $DIR_UPDATE
mkdir $DIR_UPDATE
# backup the users database (test to delete in future version)
$DIR_BIN/alcasar-mysql.sh --dump
if [ -e $DIR_BIN/alcasar-mysql.sh ]; then
$DIR_BIN/alcasar-mysql.sh --dump
else
/usr/local/sbin/alcasar-mysql.sh --dump
fi
cp /var/Save/base/`ls -1t /var/Save/base|head -1` $DIR_UPDATE
# backup the logo
cp -f $DIR_WEB/images/organisme.png $DIR_UPDATE
145,7 → 152,7
echo "SMS=off" >> $DIR_UPDATE/etc/alcasar.conf
fi
if [ $(grep -c '^SMS_NUM=' $DIR_UPDATE/etc/alcasar.conf) -eq 0 ]; then
echo "SMS_NUM=" >> $DIR_UPDATE/etc/alcasar.conf
echo "SMS_NUM=0" >> $DIR_UPDATE/etc/alcasar.conf
fi
fi
###################### End of modifications between versions #######################
162,7 → 169,7
chown -R root:apache /etc/pki
chmod -R 750 /etc/pki
# Import of the users database
$DIR_BIN/alcasar-mysql.sh --import `ls $DIR_UPDATE/alcasar-users-database*`
gzip -dc < `ls $DIR_UPDATE/alcasar-users-database*` | mysql -u$DB_USER -p$DB_PASS
# Retrieve local parameters
cp -rf $DIR_UPDATE/etc/* $DIR_ETC/
mv -f $DIR_UPDATE/etc/hosts /etc/hosts
/scripts/alcasar-mysql.sh
9,7 → 9,6
# Management of mysql 'radius' database (save / import / RAZ). Close the accounting open sessions
 
rep_tr="/var/Save/base" # répertoire d'accueil des sauvegardes
DIR_BIN="/usr/local/bin"
PASSWD_FILE="/root/ALCASAR-passwords.txt"
DB_RADIUS="radius"
DB_USER=$(grep '^db_user=' $PASSWD_FILE | cut -d'=' -f 2-)
118,10 → 117,6
stop_acct
;;
esac
migrationsPath="$DIR_BIN/alcasar-migrations"
"$migrationsPath/alcasar-migration-3.2.0_dbStructure.sh"
"$migrationsPath/alcasar-migration-3.3.0_dbRadiusAttrs.sh"
"$migrationsPath/alcasar-migration-3.3.1_dbRadiusAttrs.sh"
fi
;;
-r | --raz | -raz)