Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 3197 → Rev 3200

/CHANGELOG.md
10,6 → 10,7
* BUGS
* SECURITY
* WEB
* WebSVN is now in HTTPS
## 3.6.1 (SVN revision: 3180)
* NEWS
* CHANGES
/alcasar.sh
1283,7 → 1283,7
[ -e $DIR_E2G/e2guardian.conf.default ] || cp $DIR_E2G/e2guardian.conf $DIR_E2G/e2guardian.conf.default
# French deny HTML page
$SED "s?^language =.*?language = 'french'?g" $DIR_E2G/e2guardian.conf
# +++ listen & loop prevention on loopback
# Listen & loop prevention on loopback
$SED "s?^#checkip = 127.0.0.1.*?checkip = 127.0.0.1?g" $DIR_E2G/e2guardian.conf
# 2 filtergroups (8080 & 8090)
$SED "s?^#filtergroups =.*?filtergroups = 2?g" $DIR_E2G/e2guardian.conf
1317,10 → 1317,10
###### ALCASAR filtering for group1 (blacklisted_users) ####
# Adapt group1 conf file
[ -e $DIR_E2G/e2guardianf1.conf.default ] || cp $DIR_E2G/e2guardianf1.conf $DIR_E2G/e2guardianf1.conf.default
$SED "s/^#reportinglevel =.*/reportinglevel = 3/g" $DIR_E2G/e2guardianf1.conf
$SED "s/^#groupname =.*/groupname = 'blacklisted_users'/g" $DIR_E2G/e2guardianf1.conf
$SED "s/^#htmltemplate =.*/htmltemplate = 'alcasar-e2g.html'/g" $DIR_E2G/e2guardianf1.conf
$SED "s/^.Define LISTDIR.*/.Define LISTDIR <$DIR_E2G/lists/group1/g" $DIR_E2G/e2guardianf1.conf
$SED "s?^#reportinglevel =.*?reportinglevel = 3?g" $DIR_E2G/e2guardianf1.conf
$SED "s?^#groupname =.*?groupname = 'blacklisted_users'?g" $DIR_E2G/e2guardianf1.conf
$SED "s?^#htmltemplate =.*?htmltemplate = 'alcasar-e2g.html'?g" $DIR_E2G/e2guardianf1.conf
$SED "s?^\.Define LISTDIR.*?\.Define LISTDIR <$DIR_E2G/lists/group1>?g" $DIR_E2G/e2guardianf1.conf
DIR_E2G_GROUP1="$DIR_E2G/lists/group1"
cp -r $DIR_E2G/lists/example.group $DIR_E2G_GROUP1
chown -R e2guardian:root $DIR_E2G_GROUP1
/scripts/alcasar-rpm.sh
107,6 → 107,9
fi
done
 
# Clean the RPM cache
urpmi --clean
 
# At this time, we only skip Kernel update
echo "/^kernel/" > /etc/urpmi/skip.list
if [ `grep -E '^exclude=' /etc/dnf/dnf.conf |wc -l` -eq "1" ]; then
161,8 → 164,6
rpm_error
exit 1
fi
# Clean the RPM cache
urpmi --clean
 
# Download of ALCASAR specifics RPM in cache (and test)
if [ $Lang == "fr" ]