restructuring and optimizations

- moved misc and pkg to data/scripts
- started recover procedure
- optimized clean stale ids
This commit is contained in:
Radu Ioan Fericean
2014-11-26 15:06:06 +02:00
parent 489c17c561
commit 5f7fac2f64
18 changed files with 38 additions and 7 deletions

View File

@@ -0,0 +1,18 @@
/*
Rating system designed to be used in VoIP Carriers World
Copyright (C) 2014 ITsysCOM
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>
*/

24
data/scripts/header.sh Executable file
View File

@@ -0,0 +1,24 @@
# check for arguments
if [ $# -ne 1 ]
then
echo "Error in $0 - Invalid Argument Count"
echo "Syntax: $0 input_file - copyright header file"
exit
fi
# check for header file
infile=$1
if [ ! -f $infile ]
then
echo "Input file [$infile] not found - Aborting"
exit
fi
# inject header
for i in *.go
do
if ! grep -q Copyright $i
then
cat $infile $i >$i.new && mv $i.new $i
fi
done

View File

@@ -0,0 +1,17 @@
# defaults file for CGRateS real-time charging system
# start CGRateS init.d script?
# starts with "true"
ENABLE=false
# Start with specific user/group
#USER=cgrates
#GROUP=cgrates
# what extra options to give cgrates binary?
# See cgr-engine -h for options
#ENGINE_OPTS=''
# Don't forget to create an appropriate config file,
# else the CGRateS system will not start.

View File

@@ -0,0 +1,168 @@
#! /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 <danb@cgrates.org>
#
# 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
ENGINE_OPTS=""
RUNDIR=/var/run/$NAME
PIDFILE=$RUNDIR/cgr-engine.pid
SCRIPTNAME=/etc/init.d/$NAME
DEFAULTS=/etc/default/$NAME
ENABLE=false
# Exit if the package is not installed
[ -x "$DAEMON" ] || exit 0
# Read configuration variable file if it is present
[ -r $DEFAULTS ] && . $DEFAULTS
# 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 $RUNDIR
chown $USER:$GROUP $RUNDIR
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
start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
|| return 1
start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile --exec $DAEMON --chuid $USER:$GROUP --background -- \
$ENGINE_OPTS \
|| 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
:

View File

@@ -0,0 +1,24 @@
cgrates (0.9.1-rc6) UNRELEASED; urgency=low
* RC6.
-- DanB <danb@cgrates.org> Wednesday, 10 September 2014 13:30:00 +0100
cgrates (0.9.1-rc5) UNRELEASED; urgency=low
* RC5.
-- DanB <danb@cgrates.org> Monday, 18 August 2014 13:30:00 +0100
cgrates (0.9.1-rc4) UNRELEASED; urgency=low
* RC4.
-- DanB <danb@cgrates.org> Thursday, 25 March 2014 17:30:00 +0100
cgrates (0.9.1-rc3) UNRELEASED; urgency=low
* RC3.
-- DanB <danb@cgrates.org> Fri, 03 Jan 2014 17:37:31 +0100

View File

@@ -0,0 +1 @@
7

View File

@@ -0,0 +1,14 @@
Source: cgrates
Section: base
Priority: optional
Maintainer: DanB <danb@cgrates.org>
Build-Depends: debhelper, git
Standards-Version: 3.9.1
Homepage: http://cgrates.org
Package: cgrates
Architecture: amd64
Suggests: git, redis-server, mysql-server
Version: 0.9.1-rc6
Description: Carrier Grade Real-time Charging System
CGRateS is a very fast and easy scalable real-time charging system for Telecom environments.

View File

@@ -0,0 +1,12 @@
Original packaging work by:
Gustavo Niemeyer <niemeyer@canonical.com> on Wed, 02 Feb 2011 11:38:38 -0200
Downloaded from:
http://launchpad.net/lbox
The Debian packaging is:
Copyright (C) 2011 Canonical Ltd.
Further development:
Copyright (C) 2014 ITsysCOM GmbH

View File

View File

@@ -0,0 +1,46 @@
#! /bin/sh
#
# $Id$
PKG=cgrates
set -e
# summary of how this script can be called:
# * <postinst> `configure' <most-recently-configured-version>
# * <old-postinst> `abort-upgrade' <new version>
# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
# <new-version>
# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
# <failed-install-package> <version> `removing'
# <conflicting-package> <version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
#
# quoting from the policy:
# Any necessary prompting should almost always be confined to the
# post-installation script, and should be protected with a conditional
# so that unnecessary prompting doesn't happen if a package's
# installation fails and the `postinst' is called with `abort-upgrade',
# `abort-remove' or `abort-deconfigure'.
case "$1" in
configure)
adduser --quiet --system --group --disabled-password --shell /bin/false --home /var/run/cgrates --gecos "CGRateS" cgrates || true
chown -R cgrates:cgrates /var/log/cgrates/
chown -R cgrates:cgrates /usr/share/cgrates/
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
*)
echo "postinst called with unknown argument \`$1'" >&2
exit 1
;;
esac
#DEBHELPER#

47
data/scripts/pkg/debian/rules Executable file
View File

@@ -0,0 +1,47 @@
#!/usr/bin/make -f
# -*- makefile -*-
# Uncomment this to turn on verbose mode.
export DH_VERBOSE=1
export GOPATH=$(CURDIR)
PKGDIR=debian/cgrates
SRCDIR=src/github.com/cgrates/cgrates
%:
dh $@
clean:
dh_clean
rm -rf $(GOPATH)/bin/* $(GOPATH)/pkg/*
#cd $(GOPATH)/src && find * -name '*.go' -exec dirname {} \; | xargs -n1 go clean
rm -f $(GOPATH)/goinstall.log
binary-arch: clean
dh_prep
dh_installdirs
exec $(SRCDIR)/update_external_libs.sh
cd $(SRCDIR) && go install
mkdir -p $(PKGDIR)/usr/bin
cp $(GOPATH)/bin/cgr-* $(PKGDIR)/usr/bin/
mkdir -p $(PKGDIR)/etc/cgrates
cp $(SRCDIR)/data/conf/cgrates.cfg $(PKGDIR)/etc/cgrates/
mkdir -p $(PKGDIR)/usr/share/cgrates
cp -r $(SRCDIR)/data/* $(PKGDIR)/usr/share/cgrates/
mkdir -p $(PKGDIR)/var/log/cgrates/cdrc/in
mkdir -p $(PKGDIR)/var/log/cgrates/cdrc/out
mkdir -p $(PKGDIR)/var/log/cgrates/cdre/csv
mkdir -p $(PKGDIR)/var/log/cgrates/cdre/fwv
mkdir -p $(PKGDIR)/var/log/cgrates/history
mkdir -p $(PKGDIR)/var/log/cgrates/tpe
dh_strip
dh_compress
dh_fixperms
dh_installinit
dh_installdeb
dh_gencontrol
dh_md5sums
dh_builddeb
binary: binary-arch

View File

@@ -0,0 +1 @@
3.0 (native)

View File

@@ -0,0 +1,5 @@
tar-ignore = .hg
tar-ignore = .git
tar-ignore = .bzr
tar-ignore = .gitignore
tar-ignore = .travis.yml

View File

@@ -0,0 +1,14 @@
#! /usr/bin/env sh
WORK_DIR=/tmp/cgrates
rm -rf $WORK_DIR
mkdir -p $WORK_DIR
cp -r debian $WORK_DIR/debian
cd $WORK_DIR
git clone https://github.com/cgrates/cgrates.git src/github.com/cgrates/cgrates
tar xvzf src/github.com/cgrates/cgrates/data/tutorials/fs_csv/freeswitch/etc/freeswitch_conf.tar.gz -C src/github.com/cgrates/cgrates/data/tutorials/fs_csv/freeswitch/etc/
rm src/github.com/cgrates/cgrates/data/tutorials/fs_csv/freeswitch/etc/freeswitch_conf.tar.gz
tar xvzf src/github.com/cgrates/cgrates/data/tutorials/fs_json/freeswitch/etc/freeswitch_conf.tar.gz -C src/github.com/cgrates/cgrates/data/tutorials/fs_json/freeswitch/etc/
rm src/github.com/cgrates/cgrates/data/tutorials/fs_json/freeswitch/etc/freeswitch_conf.tar.gz
dpkg-buildpackage -us -uc
#rm -rf $WORK_DIR