commit 05831af9e17ef63ae3dfda653dce934237a36ab0
Author: Mariusz Mazur <[email protected]>
Date: Thu Jul 30 15:03:41 2015 +0200
Add systemd support
media-dispatcher.service | 12 ++++++++++++
media-relay.service | 12 ++++++++++++
mediaproxy.spec | 31 ++++++++++++++++++++++++-------
3 files changed, 48 insertions(+), 7 deletions(-)
---
diff --git a/mediaproxy.spec b/mediaproxy.spec
index 490b269..22f8964 100644
--- a/mediaproxy.spec
+++ b/mediaproxy.spec
@@ -9,9 +9,11 @@ Source0:
http://download.ag-projects.com/MediaProxy/%{name}-%{version}.tar.gz
# Source0-md5: 72443d6137c77c3c9cd446ca98ec5d21
Source1: media-dispatcher.sysconfig
Source2: media-dispatcher.init
-Source3: media-relay.sysconfig
-Source4: media-relay.init
-Source5: %{name}.tmpfiles
+Source3: media-dispatcher.service
+Source4: media-relay.sysconfig
+Source5: media-relay.init
+Source6: media-relay.service
+Source7: %{name}.tmpfiles
URL: http://mediaproxy.ag-projects.com/
BuildRequires: iptables-devel
BuildRequires: libnetfilter_conntrack-devel
@@ -102,7 +104,8 @@ python setup.py build
%install
rm -rf $RPM_BUILD_ROOT
install -d
$RPM_BUILD_ROOT{%{_sysconfdir}/%{name},/var/run/%{name},%{systemdtmpfilesdir}} \
- $RPM_BUILD_ROOT{/etc/sysconfig,/etc/rc.d/init.d}
+ $RPM_BUILD_ROOT{/etc/sysconfig,/etc/rc.d/init.d} \
+ $RPM_BUILD_ROOT%{systemdunitdir}
python setup.py install \
--optimize=2 \
@@ -116,9 +119,11 @@ install config.ini.sample
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.ini
install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/media-dispatcher
install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/media-dispatcher
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/media-relay
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/media-relay
-install %{SOURCE5} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
+install %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/media-dispatcher.service
+install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/media-relay
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/media-relay
+install %{SOURCE6} $RPM_BUILD_ROOT%{systemdunitdir}/media-relay.service
+install %{SOURCE7} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -126,23 +131,33 @@ rm -rf $RPM_BUILD_ROOT
%post dispatcher
/sbin/chkconfig --add media-dispatcher
%service media-relay restart
+%systemd_post media-dispatcher.service
%post relay
%service media-dispatcher restart
/sbin/chkconfig --add media-relay
+%systemd_post media-relay.service
%preun dispatcher
+%systemd_preun media-dispatcher.service
if [ "$1" = "0" ]; then
%service -q media-dispatcher stop
/sbin/chkconfig --del media-dispatcher
fi
%preun relay
+%systemd_preun media-relay.service
if [ "$1" = "0" ]; then
%service -q media-relay stop
/sbin/chkconfig --del media-relay
fi
+%postun dispatcher
+%systemd_reload
+
+%postun relay
+%systemd_reload
+
%files common
%defattr(644,root,root,755)
%doc README TODO
@@ -168,9 +183,11 @@ fi
%attr(755,root,root) %{_bindir}/media-dispatcher
%attr(754,root,root) /etc/rc.d/init.d/media-dispatcher
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/media-dispatcher
+%{systemdunitdir}/media-dispatcher.service
%files relay
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/media-relay
%attr(754,root,root) /etc/rc.d/init.d/media-relay
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/media-relay
+%{systemdunitdir}/media-relay.service
diff --git a/media-dispatcher.service b/media-dispatcher.service
new file mode 100644
index 0000000..73d67e0
--- /dev/null
+++ b/media-dispatcher.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=MediaProxy dispatcher for media relays
+After=network.target
+Before=opensips.service
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/media-dispatcher --pid /var/run/mediaproxy/dispatcher.pid
+PIDFile=/var/run/mediaproxy/dispatcher.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/media-relay.service b/media-relay.service
new file mode 100644
index 0000000..ebc9630
--- /dev/null
+++ b/media-relay.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=RTP/RTCP media relay
+After=network.target
+
+[Service]
+Type=forking
+Restart=on-failure
+ExecStart=/usr/bin/media-relay --pid /var/run/mediaproxy/relay.pid
+PIDFile=/var/run/mediaproxy/relay.pid
+
+[Install]
+WantedBy=multi-user.target
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mediaproxy.git/commitdiff/05831af9e17ef63ae3dfda653dce934237a36ab0
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
