This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via c599b6dfea0babccad9eef077e48e1a0fffed3f1 (commit) via b03cd0fb257a131f115cd669e0f405c8c8cfc033 (commit) from fad85501ea4c1f5e546b85ba4b16c990d7c5cbf1 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit c599b6dfea0babccad9eef077e48e1a0fffed3f1 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Dec 19 15:11:40 2010 +0100

Updater: add keyexchange=ikev1 to ipsec.conf.

commit b03cd0fb257a131f115cd669e0f405c8c8cfc033 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Dec 19 14:14:04 2010 +0100

Updater: add new cronjobs.

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/core/44/update.sh | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/44/update.sh b/config/rootfiles/core/44/update.sh index 24103f9..c0abbe7 100644 --- a/config/rootfiles/core/44/update.sh +++ b/config/rootfiles/core/44/update.sh @@ -85,6 +85,8 @@ cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org # /etc/init.d/snort stop /etc/init.d/squid stop +/etc/init.d/ipsec stop + # # # Remove old snort... @@ -101,9 +103,6 @@ echo Unpack the updated files ... tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \ --no-overwrite-dir

-# Re-read crontab -fcrontab -z - # Remove old pakfire cronjob. rm -f /etc/fcron.daily/pakfire-update

@@ -167,11 +166,31 @@ if [ ! -z $SWAP ]; then echo "WARNING! swap not found!!!" fi

+#new strongswan need keyexchange=ikev1 because this is not default anymore +mv /var/ipfire/vpn/ipsec.conf /var/ipfire/vpn/ipsec.conf.org +grep -v "keyexchange=ikev1" /var/ipfire/vpn/ipsec.conf.org > /var/ipfire/vpn/ipsec.conf +sed -i "s|^conn [A-Za-z].*$|&\n\tkeyexchange=ikev1|g" /var/ipfire/vpn/ipsec.conf + # # Start services # /etc/init.d/squid start /etc/init.d/snort start +/etc/init.d/ipsec start + + +# Add pakfire and fireinfo cronjobs... +grep -v "# fireinfo" /var/spool/cron/root.orig | +grep -v "/usr/bin/sendprofile" | +grep -v "# pakfire" | +grep -v "/usr/local/bin/pakfire" > /var/tmp/root.tmp +echo "" >> /var/tmp/root.tmp +echo "# fireinfo" >> /var/tmp/root.tmp +echo "%nightly,random * 23-4 /usr/bin/sendprofile >/dev/null 2>&1" >> /var/tmp/root.tmp +echo "" >> /var/tmp/root.tmp +echo "# pakfire" >> /var/tmp/root.tmp +echo "%nightly,random * 23-4 /usr/local/bin/pakfire update >/dev/null 2>&1" >> /var/tmp/root.tmp +fcrontab /var/tmp/root.tmp

# # Modify grub.conf

hooks/post-receive -- IPFire 2.x development tree