* [IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 8ca3ef31bef42ce65845cf29554f888a2bfd3312
@ 2012-08-01 20:09 git
0 siblings, 0 replies; only message in thread
From: git @ 2012-08-01 20:09 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 6626 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 3.x development tree".
The branch, master has been updated
via 8ca3ef31bef42ce65845cf29554f888a2bfd3312 (commit)
via 7e3dbc56531a1958ef865827eaf8e20cd12e9459 (commit)
via 5551202fd27a8c23946ce5fffbeaf6d3a2837b8c (commit)
via c301c6027f2b8b6120aee0ee9300b01f95ec5a2f (commit)
via bf6fb1eb3e4f760e2702c56f6315f261d54a314d (commit)
from 572b430895e61e9500891fe2ef851ede8e61508e (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 8ca3ef31bef42ce65845cf29554f888a2bfd3312
Merge: 7e3dbc5 5551202
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Aug 1 22:09:14 2012 +0200
Merge remote-tracking branch 'stevee/openvswitch-systemd'
commit 7e3dbc56531a1958ef865827eaf8e20cd12e9459
Merge: 572b430 c301c60
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Aug 1 22:08:13 2012 +0200
Merge remote-tracking branch 'ms/openvswitch'
commit 5551202fd27a8c23946ce5fffbeaf6d3a2837b8c
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Wed Aug 1 20:33:35 2012 +0200
openvswitch: Add service file for systemd.
Fixes #10201.
commit c301c6027f2b8b6120aee0ee9300b01f95ec5a2f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Jul 31 10:54:59 2012 +0200
openvswitch: Update to 1.7.0.
commit bf6fb1eb3e4f760e2702c56f6315f261d54a314d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu May 10 01:33:10 2012 +0200
openswitch: Initial import.
-----------------------------------------------------------------------
Summary of changes:
openvswitch/openvswitch.logrotate | 20 +++++++
openvswitch/openvswitch.nm | 91 +++++++++++++++++++++++++++++++
openvswitch/systemd/openvswitch.service | 14 +++++
3 files changed, 125 insertions(+), 0 deletions(-)
create mode 100644 openvswitch/openvswitch.logrotate
create mode 100644 openvswitch/openvswitch.nm
create mode 100644 openvswitch/systemd/openvswitch.service
Difference in files:
diff --git a/openvswitch/openvswitch.logrotate b/openvswitch/openvswitch.logrotate
new file mode 100644
index 0000000..1a08fa9
--- /dev/null
+++ b/openvswitch/openvswitch.logrotate
@@ -0,0 +1,20 @@
+# Copyright (C) 2009, 2010, 2011 Nicira Networks, Inc.
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved. This file is offered as-is,
+# without warranty of any kind.
+
+/var/log/openvswitch/*.log {
+ sharedscripts
+ missingok
+ postrotate
+ # Tell Open vSwitch daemons to reopen their log files
+ if [ -e /var/run/openvswitch/ovs-vswitchd.pid ]; then
+ /usr/bin/ovs-appctl -t ovs-vswitchd vlog/reopen
+ fi
+ if [ -e /var/run/openvswitch/ovsdb-server.pid ]; then
+ /usr/bin/ovs-appctl -t ovsdb-server vlog/reopen
+ fi
+ endscript
+}
diff --git a/openvswitch/openvswitch.nm b/openvswitch/openvswitch.nm
new file mode 100644
index 0000000..928d152
--- /dev/null
+++ b/openvswitch/openvswitch.nm
@@ -0,0 +1,91 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = openvswitch
+version = 1.7.0
+release = 2
+
+groups = Networking/Tools
+url = http://openvswitch.org/
+license = ASL 2.0 and LGPLv2+ and SISSL
+summary = Open vSwitch daemon/database/utilities.
+
+description
+ Open vSwitch provides standard network bridging functions and
+ support for the OpenFlow protocol for remote per-flow control
+ of traffic.
+end
+
+source_dl = http://openvswitch.org/releases/
+
+build
+ requires
+ groff
+ openssl-devel
+ systemd-units
+ end
+
+ configure_options += \
+ --enable-ssl \
+ --with-pkidir=%{sharedstatedir}/openvswitch/pki
+
+ install_cmds
+ # Install logrotate file.
+ mkdir -pv %{BUILDROOT}%{sysconfdir}/logrotate.d
+ install -m 644 %{DIR_SOURCE}/openvswitch.logrotate \
+ %{BUILDROOT}%{sysconfdir}/logrotate.d/openvswitch
+
+ mkdir -pv %{BUILDROOT}%{sharedstatedir}/openvswitch
+
+ # Remove stuff we don't want to support.
+ rm -vf \
+ %{BUILDROOT}%{bindir}/ovs-controller \
+ %{BUILDROOT}%{sbindir}/ovs-{vlan-bug-workaround,brcompatd} \
+ %{BUILDROOT}%{mandir}/man8/ovs-{controller,vlan-bug-workaround,brcompatd}.8
+ end
+end
+
+packages
+ package %{name}
+ script postin
+ systemctl daemon-reload >/dev/null 2>&1 || :
+ end
+
+ script postup
+ systemctl daemon-reload >/dev/null 2>&1 || :
+ systemctl try-restart openvswitch.service >/dev/null 2>&1 || :
+ end
+
+ script postun
+ systemctl --no-reload disable openvswitch.service >/dev/null 2>&1 || :
+ systemctl stop openvswitch.service >/dev/null 2>&1 || :
+ end
+
+ configfiles
+ %{sysconfdir}/logrotate.d/openvswitch
+ end
+ end
+
+ package %{name}-test
+ summary = Open vSwitch testing utilities.
+ license = ASL 2.0
+ description
+ Utilities that are useful to diagnose performance and connectivity
+ issues in Open vSwitch setup.
+ end
+ arch = noarch
+
+ files
+ %{bindir}/ovs-test
+ %{bindir}/ovs-vlan-test
+ %{mandir}/man8/ovs-test.8*
+ %{mandir}/man8/ovs-vlan-test.8*
+ end
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/openvswitch/systemd/openvswitch.service b/openvswitch/systemd/openvswitch.service
new file mode 100644
index 0000000..7aeae19
--- /dev/null
+++ b/openvswitch/systemd/openvswitch.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Open vSwitch
+After=syslog.target network.target
+
+[Service]
+Type=oneshot
+ExecStartPre=/usr/share/openvswitch/scripts/ovs-ctl enable-protocol --protocol=gre
+ExecStart=/usr/share/openvswitch/scripts/ovs-ctl --system-id=random start
+ExecStop=/usr/share/openvswitch/scripts/ovs-ctl stop
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
+
hooks/post-receive
--
IPFire 3.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-08-01 20:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-01 20:09 [IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 8ca3ef31bef42ce65845cf29554f888a2bfd3312 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox