* [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 2751238e6fc5ab0bfa01923cda24f7adc41b747f
@ 2014-04-15 23:56 git
0 siblings, 0 replies; only message in thread
From: git @ 2014-04-15 23:56 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 9533 bytes --]
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 2751238e6fc5ab0bfa01923cda24f7adc41b747f (commit)
from b18b011b840ced8db756d75b7bd0e40c940e11b6 (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 2751238e6fc5ab0bfa01923cda24f7adc41b747f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Apr 16 01:54:14 2014 +0200
move core75 files to oldcore.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/{core => oldcore}/75/exclude | 0
config/rootfiles/{core => oldcore}/75/filelists/files | 0
config/rootfiles/{core => oldcore}/75/meta | 0
config/rootfiles/{core => oldcore}/75/update.sh | 0
4 files changed, 0 insertions(+), 0 deletions(-)
rename config/rootfiles/{core => oldcore}/75/exclude (100%)
rename config/rootfiles/{core => oldcore}/75/filelists/files (100%)
rename config/rootfiles/{core => oldcore}/75/meta (100%)
rename config/rootfiles/{core => oldcore}/75/update.sh (100%)
Difference in files:
diff --git a/config/rootfiles/core/75/exclude b/config/rootfiles/core/75/exclude
deleted file mode 100644
index 321a931..0000000
--- a/config/rootfiles/core/75/exclude
+++ /dev/null
@@ -1,17 +0,0 @@
-srv/web/ipfire/html/proxy.pac
-boot/config.txt
-etc/udev/rules.d/30-persistent-network.rules
-etc/collectd.custom
-etc/shadow
-etc/ipsec.conf
-etc/ipsec.secrets
-etc/ipsec.user.conf
-etc/ipsec.user.secrets
-var/log/cache
-var/updatecache
-etc/localtime
-var/ipfire/ovpn
-etc/ssh/ssh_config
-etc/ssh/sshd_config
-etc/ssl/openssl.cnf
-var/state/dhcp/dhcpd.leases
diff --git a/config/rootfiles/core/75/filelists/files b/config/rootfiles/core/75/filelists/files
deleted file mode 100644
index 9d4fbe4..0000000
--- a/config/rootfiles/core/75/filelists/files
+++ /dev/null
@@ -1,9 +0,0 @@
-etc/system-release
-etc/issue
-opt/pakfire/lib/functions.pl
-srv/web/ipfire/cgi-bin/ovpnmain.cgi
-usr/lib/openvpn/verify
-usr/local/bin/convert-ovpn
-var/ipfire/backup/bin/backup.pl
-var/ipfire/header.pl
-var/ipfire/langs
diff --git a/config/rootfiles/core/75/meta b/config/rootfiles/core/75/meta
deleted file mode 100644
index d547fa8..0000000
--- a/config/rootfiles/core/75/meta
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/core/75/update.sh b/config/rootfiles/core/75/update.sh
deleted file mode 100644
index 94bec74..0000000
--- a/config/rootfiles/core/75/update.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire is free software; you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation; either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# IPFire is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2013 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-
-# Remove old core updates from pakfire cache to save space...
-core=75
-for (( i=1; i<=$core; i++ ))
-do
- rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
-done
-
-# Stop services
-
-# Extract files
-extract_files
-
-# Start services
-
-# Replace path to verify script.
-if [ -r "/var/ipfire/ovpn/server.conf" ]; then
- sed -e "s@^tls-verify.*@tls-verify /usr/lib/openvpn/verify(a)g" \
- -i /var/ipfire/ovpn/server.conf
-fi
-
-# Convert CCD files.
-/usr/local/bin/convert-ovpn
-
-# Update Language cache
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-
-sync
-
-# This update need a reboot...
-#touch /var/run/need_reboot
-
-# Finish
-/etc/init.d/fireinfo start
-sendprofile
-
-# Don't report the exitcode last command
-exit 0
diff --git a/config/rootfiles/oldcore/75/exclude b/config/rootfiles/oldcore/75/exclude
new file mode 100644
index 0000000..321a931
--- /dev/null
+++ b/config/rootfiles/oldcore/75/exclude
@@ -0,0 +1,17 @@
+srv/web/ipfire/html/proxy.pac
+boot/config.txt
+etc/udev/rules.d/30-persistent-network.rules
+etc/collectd.custom
+etc/shadow
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/log/cache
+var/updatecache
+etc/localtime
+var/ipfire/ovpn
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+var/state/dhcp/dhcpd.leases
diff --git a/config/rootfiles/oldcore/75/filelists/files b/config/rootfiles/oldcore/75/filelists/files
new file mode 100644
index 0000000..9d4fbe4
--- /dev/null
+++ b/config/rootfiles/oldcore/75/filelists/files
@@ -0,0 +1,9 @@
+etc/system-release
+etc/issue
+opt/pakfire/lib/functions.pl
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+usr/lib/openvpn/verify
+usr/local/bin/convert-ovpn
+var/ipfire/backup/bin/backup.pl
+var/ipfire/header.pl
+var/ipfire/langs
diff --git a/config/rootfiles/oldcore/75/meta b/config/rootfiles/oldcore/75/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/oldcore/75/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/oldcore/75/update.sh b/config/rootfiles/oldcore/75/update.sh
new file mode 100644
index 0000000..94bec74
--- /dev/null
+++ b/config/rootfiles/oldcore/75/update.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2013 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+# Remove old core updates from pakfire cache to save space...
+core=75
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Stop services
+
+# Extract files
+extract_files
+
+# Start services
+
+# Replace path to verify script.
+if [ -r "/var/ipfire/ovpn/server.conf" ]; then
+ sed -e "s@^tls-verify.*@tls-verify /usr/lib/openvpn/verify(a)g" \
+ -i /var/ipfire/ovpn/server.conf
+fi
+
+# Convert CCD files.
+/usr/local/bin/convert-ovpn
+
+# Update Language cache
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+sync
+
+# This update need a reboot...
+#touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Don't report the exitcode last command
+exit 0
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-04-15 23:56 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-15 23:56 [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 2751238e6fc5ab0bfa01923cda24f7adc41b747f git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox