diff --git a/data/ansible/rpm_packages/cgrates.spec.j2 b/data/ansible/rpm_packages/cgrates.spec.j2 index 710dba1d2..41e80a0d9 100644 --- a/data/ansible/rpm_packages/cgrates.spec.j2 +++ b/data/ansible/rpm_packages/cgrates.spec.j2 @@ -98,7 +98,7 @@ mkdir -p $RPM_BUILD_ROOT%{_spooldir}/failed_posts mkdir -p $RPM_BUILD_ROOT%{_libdir}/history mkdir -p $RPM_BUILD_ROOT%{_libdir}/cache_dump mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d -install -m 755 {{ cgrates_dir }}/data/conf/logging/deb_logrotate.conf $RPM_BUILD_ROOT/etc/logrotate.d/%{name} +install -m 755 {{ cgrates_dir }}/data/conf/logging/logrotate.conf $RPM_BUILD_ROOT/etc/logrotate.d/%{name} install -D -m 0644 -p src/github.com/cgrates/cgrates/packages/redhat_fedora/%{name}.options $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} %if 0%{?fedora} > 16 || 0%{?rhel} > 6 install -D -m 0644 -p src/github.com/cgrates/cgrates/packages/redhat_fedora/%{name}.service $RPM_BUILD_ROOT%{_unitdir}/%{name}.service diff --git a/data/conf/logging/deb_logrotate.conf b/data/conf/logging/logrotate.conf similarity index 100% rename from data/conf/logging/deb_logrotate.conf rename to data/conf/logging/logrotate.conf diff --git a/data/conf/logging/deb_rsyslog.conf b/data/conf/logging/rsyslog.conf similarity index 100% rename from data/conf/logging/deb_rsyslog.conf rename to data/conf/logging/rsyslog.conf diff --git a/packages/debian/rules b/packages/debian/rules index eb458bc01..a1f9aff97 100755 --- a/packages/debian/rules +++ b/packages/debian/rules @@ -28,8 +28,8 @@ binary-arch: clean cp -r $(CURDIR)/data/conf/cgrates $(PKGDIR)/etc/ mkdir -p $(PKGDIR)/etc/logrotate.d mkdir -p $(PKGDIR)/etc/rsyslog.d - cp -r $(CURDIR)/data/conf/logging/deb_logrotate.conf $(PKGDIR)/etc/logrotate.d/cgrates - cp -r $(CURDIR)/data/conf/logging/deb_rsyslog.conf $(PKGDIR)/etc/rsyslog.d/25-cgrates.conf + cp -r $(CURDIR)/data/conf/logging/logrotate.conf $(PKGDIR)/etc/logrotate.d/cgrates + cp -r $(CURDIR)/data/conf/logging/rsyslog.conf $(PKGDIR)/etc/rsyslog.d/25-cgrates.conf mkdir -p $(PKGDIR)/usr/share/cgrates cp -r $(CURDIR)/data/* $(PKGDIR)/usr/share/cgrates/ tar -xzvf $(PKGDIR)/usr/share/cgrates/tutorials/fs_evsock/freeswitch/etc/freeswitch_conf.tar.gz -C $(PKGDIR)/usr/share/cgrates/tutorials/fs_evsock/freeswitch/etc/