From 318a7214a4ef854e37195351af99cf2def1d81e0 Mon Sep 17 00:00:00 2001 From: nickolasdaniel Date: Thu, 8 Jul 2021 11:14:31 +0300 Subject: [PATCH] Removed creation of history folder in make and spec files since we are not using the folder --- data/ansible/rpm_packages/cgrates.spec.j2 | 1 - .../etc/init.d/.fuse_hidden0000001700000001 | 181 ------------------ packages/debian/rules | 1 - packages/redhat_fedora/cgrates.spec | 1 - 4 files changed, 184 deletions(-) delete mode 100755 data/tutorials/kamevapi/cgrates/etc/init.d/.fuse_hidden0000001700000001 diff --git a/data/ansible/rpm_packages/cgrates.spec.j2 b/data/ansible/rpm_packages/cgrates.spec.j2 index 1e710f5d4..d6b130b13 100644 --- a/data/ansible/rpm_packages/cgrates.spec.j2 +++ b/data/ansible/rpm_packages/cgrates.spec.j2 @@ -97,7 +97,6 @@ mkdir -p $RPM_BUILD_ROOT%{_spooldir}/cdre/fwv mkdir -p $RPM_BUILD_ROOT%{_spooldir}/tpe mkdir -p $RPM_BUILD_ROOT%{_spooldir}/failed_posts mkdir -p $RPM_BUILD_ROOT%{_spooldir}/analyzers -mkdir -p $RPM_BUILD_ROOT%{_libdir}/history mkdir -p $RPM_BUILD_ROOT%{_libdir}/cache_dump mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d mkdir -p $RPM_BUILD_ROOT/etc/rsyslog.d diff --git a/data/tutorials/kamevapi/cgrates/etc/init.d/.fuse_hidden0000001700000001 b/data/tutorials/kamevapi/cgrates/etc/init.d/.fuse_hidden0000001700000001 deleted file mode 100755 index 2ac49229a..000000000 --- a/data/tutorials/kamevapi/cgrates/etc/init.d/.fuse_hidden0000001700000001 +++ /dev/null @@ -1,181 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: cgrates -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: CGRateS real-time charging system -# Description: Control CGRateS - carrier grade real-time charging system -### END INIT INFO - -# Author: DanB -# -# Do NOT "set -e" - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="CGRateS real-time charging system" -NAME=cgrates -DAEMON=/usr/bin/cgr-engine -USER=cgrates -GROUP=cgrates -DAEMON_OPTS="" -TUTFOLDER=/usr/share/cgrates/tutorials/fs_evsock/cgrates -TMP_DIR=/tmp/cgr_evsock/cgrates -SCRIPTNAME=$TUTFOLDER/etc/init.d/$NAME -RUNDIR=$TMP_DIR/run -PIDFILE=$RUNDIR/cgr-engine.pid -STACKTRACE=$RUNDIR/$NAME.strace -ENABLE=true -DAEMON_OPTS="-config_path=/usr/share/cgrates/tutorials/fs_evsock/cgrates/etc/cgrates" -HISTDIR=$TMP_DIR/history -CDREDIR=$TMP_DIR/cdre - -# Exit if the package is not installed -[ -x "$DAEMON" ] || exit 0 - -# Load the VERBOSE setting and other rcS variables -. /lib/init/vars.sh - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.2-14) to ensure that this file is present -# and status_of_proc is working. -. /lib/lsb/init-functions - -if [ "$ENABLE" != "true" ]; then - echo "$DESC not yet configured. Edit $DEFAULTS first." - exit 0 -fi - -# Install the run folder -if [ ! -d $RUNDIR ]; then - mkdir -p $RUNDIR - touch $STACKTRACE - chown -R $USER:$GROUP $RUNDIR -fi -# Install the cdre folder -if [ ! -d $CDREDIR ]; then - mkdir -p $CDREDIR - chown $USER:$GROUP $CDREDIR -fi -# Install the history folder -if [ ! -d $HISTDIR ]; then - mkdir -p $HISTDIR - chown $USER:$GROUP $HISTDIR -fi - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - echo "\n### Started at:" `date`>>$STACKTRACE - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test\ - || return 1 - start-stop-daemon --start --quiet --chuid $USER:$GROUP --make-pidfile --pidfile $PIDFILE --background\ - --startas /bin/bash -- -c "exec $DAEMON $DAEMON_OPTS >> $STACKTRACE 2>&1" \ - || return 2 -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME - return 0 -} - -case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - #reload|force-reload) - # - # If do_reload() is not implemented then leave this commented out - # and leave 'force-reload' as an alias for 'restart'. - # - #log_daemon_msg "Reloading $DESC" "$NAME" - #do_reload - #log_end_msg $? - #;; - restart|force-reload) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff --git a/packages/debian/rules b/packages/debian/rules index ce564e0eb..ef74c1d9f 100755 --- a/packages/debian/rules +++ b/packages/debian/rules @@ -41,7 +41,6 @@ binary-arch: clean mkdir -p $(PKGDIR)/var/spool/cgrates/tpe mkdir -p $(PKGDIR)/var/spool/cgrates/failed_posts mkdir -p $(PKGDIR)/var/spool/cgrates/analyzers - mkdir -p $(PKGDIR)/var/lib/cgrates/history mkdir -p $(PKGDIR)/var/lib/cgrates/cache_dump mkdir -p $(PKGDIR)/var/log/cgrates dh_strip diff --git a/packages/redhat_fedora/cgrates.spec b/packages/redhat_fedora/cgrates.spec index 7fa7ae67a..c20a5b25b 100644 --- a/packages/redhat_fedora/cgrates.spec +++ b/packages/redhat_fedora/cgrates.spec @@ -99,7 +99,6 @@ mkdir -p $RPM_BUILD_ROOT%{_spooldir}/cdre/fwv mkdir -p $RPM_BUILD_ROOT%{_spooldir}/tpe mkdir -p $RPM_BUILD_ROOT%{_spooldir}/failed_posts mkdir -p $RPM_BUILD_ROOT%{_spooldir}/analyzers -mkdir -p $RPM_BUILD_ROOT%{_libdir}/history mkdir -p $RPM_BUILD_ROOT%{_libdir}/cache_dump mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d mkdir -p $RPM_BUILD_ROOT/etc/rsyslog.d