diff --git a/packaging/redhat_fedora/opensips-m4cfg b/packaging/redhat_fedora/opensips-m4cfg deleted file mode 100644 index 7d879ef61c7..00000000000 --- a/packaging/redhat_fedora/opensips-m4cfg +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -prog=opensips -cfgdir="/etc/$prog" -configfile="$cfgdir/$prog.cfg" -m4configfile="$cfgdir/$prog.m4" -m4archivedir="$cfgdir/archive" - -# Generate config from M4 -if [ -f $m4configfile ]; then - cd "$cfgdir" - m4 -Q $m4configfile >$configfile.tmp - if [ $? != 0 ]; then - echo "cannot process m4 macro" - rm "$configfile.tmp" - exit 1 - fi - - [ -e $configfile ] || touch $configfile - - # compare configs - if [ `md5sum ${configfile}|awk '{print $1}'` != `md5sum ${configfile}.tmp|awk '{print $1}'` ]; then - mkdir -p "${m4archivedir}" - mv "${configfile}" "${m4archivedir}/${prog}.cfg-`date +%Y%m%d_%H%M%S`" - fi - - mv "${configfile}.tmp" "${configfile}" - chown ${prog}:${prog} ${configfile} - chmod 640 ${configfile} -fi - -exec $prog -c -f $configfile diff --git a/packaging/redhat_fedora/opensips.service b/packaging/redhat_fedora/opensips.service index 155dc12a50a..38576c4ffc2 100644 --- a/packaging/redhat_fedora/opensips.service +++ b/packaging/redhat_fedora/opensips.service @@ -14,7 +14,6 @@ EnvironmentFile=-/etc/sysconfig/opensips PermissionsStartOnly=yes PIDFile=%t/opensips/opensips.pid ExecStart=/usr/sbin/opensips -P %t/opensips/opensips.pid -f /etc/opensips/opensips.cfg -m $S_MEMORY -M $P_MEMORY $OPTIONS -ExecStartPre=/usr/sbin/opensips-m4cfg ExecStop=/usr/bin/pkill --pidfile %t/opensips/opensips.pid Restart=always TimeoutStopSec=30s diff --git a/packaging/redhat_fedora/opensips.spec b/packaging/redhat_fedora/opensips.spec index d2439a123a6..3f8126bc1c5 100644 --- a/packaging/redhat_fedora/opensips.spec +++ b/packaging/redhat_fedora/opensips.spec @@ -800,7 +800,6 @@ done # install systemd files install -D -m 0644 -p packaging/redhat_fedora/%{name}.service $RPM_BUILD_ROOT%{_unitdir}/%{name}.service install -D -m 0644 -p packaging/redhat_fedora/%{name}.tmpfiles.conf $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.conf -install -D -m 0755 -p packaging/redhat_fedora/%{name}-m4cfg $RPM_BUILD_ROOT%{_sbindir}/%{name}-m4cfg mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/%{name} %else install -p -D -m 755 packaging/redhat_fedora/opensips.init $RPM_BUILD_ROOT%{_initrddir}/opensips @@ -866,7 +865,6 @@ fi %if 0%{?fedora} > 16 || 0%{?rhel} > 6 %{_unitdir}/%{name}.service %{_sysconfdir}/tmpfiles.d/%{name}.conf -%{_sbindir}/%{name}-m4cfg %dir %attr(0755, %{name}, %{name}) %{_localstatedir}/run/%{name} %else %attr(755,root,root) %{_initrddir}/opensips