Merge branch 'master' of https://github.com/cgrates/cgrates

data/docker/devel/Dockerfile

@@ -17,7 +17,7 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv EA312927
 RUN echo 'deb http://repo.mongodb.org/apt/debian wheezy/mongodb-org/3.2 main' | tee '/etc/apt/sources.list.d/mongodb-org-3.2.list'
 
 # install dependencies
-RUN apt-get -y update && apt-get -y install git bzr mercurial redis-server mysql-server python-pycurl python-mysqldb postgresql postgresql-client sudo wget freeswitch-meta-vanilla vim zsh mongodb-org
+RUN apt-get -y update && apt-get -y install git bzr mercurial redis-server mysql-server python-pycurl python-mysqldb postgresql postgresql-client sudo wget freeswitch-meta-vanilla vim zsh mongodb-org tmux rsyslog
 
 # add mongo conf
 COPY mongod.conf /etc/mongod.conf
@@ -34,6 +34,9 @@ RUN GOROOT=/root/go GOPATH=/root/code /root/go/bin/go get github.com/Masterminds
 #install oh-my-zsh
 RUN TERM=xterm sh -c "$(wget https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)"; exit 0
 
+# change shell for tmux
+RUN chsh -s /usr/bin/zsh
+
 # cleanup
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 

data/docker/devel/start.sh

@@ -2,6 +2,7 @@
 sed -i 's/127.0.0.1/0.0.0.0/g' /etc/redis/redis.conf /etc/mysql/my.cnf
 echo 'host    all             all             0.0.0.0/32            md5'>>/etc/postgresql/9.4/main/pg_hba.conf
 
+/etc/init.d/rsyslog start
 /etc/init.d/mysql start
 /etc/init.d/postgresql start
 /etc/init.d/redis-server start

data/tariffplans/testtp/AccountActions.csv

@@ -7,3 +7,4 @@ cgrates.org,1005,PREPAID_10,STANDARD_TRIGGERS,,
 cgrates.org,1009,TEST_EXE,,,
 cgrates.org,1010,TEST_DATA_r,,true,
 cgrates.org,1011,TEST_VOICE,,,
+cgrates.org,1012,PREPAID_10,,,

data/tariffplans/testtp/DestinationRates.csv

@@ -3,4 +3,5 @@ DR_RETAIL,GERMANY,RT_1CENT,*up,4,0,
 DR_RETAIL,GERMANY_MOBILE,RT_1CENT,*up,4,0,
 DR_DATA_1,*any,RT_DATA_2c,*up,4,0,
 DR_SMS_1,*any,RT_SMS_5c,*up,4,0,
-DR_DATA_r,DATA_DEST,RT_DATA_r,*up,5,0,
+DR_DATA_r,DATA_DEST,RT_DATA_r,*up,5,0,
+DR_FREE,GERMANY,RT_ZERO,*middle,2,0,

data/tariffplans/testtp/Rates.csv

@@ -3,3 +3,4 @@ RT_1CENT,0,1,1s,1s,0s
 RT_DATA_2c,0,0.002,10,10,0
 RT_SMS_5c,0,0.005,1,1,0
 RT_DATA_r,0,0.1,1048576,10240,0
+RT_ZERO,0,0,1,1,0

data/tariffplans/testtp/RatingPlans.csv

@@ -3,3 +3,4 @@ RP_RETAIL,DR_RETAIL,ALWAYS,10
 RP_DATA1,DR_DATA_1,ALWAYS,10
 RP_SMS1,DR_SMS_1,ALWAYS,10
 RP_DATAr,DR_DATA_r,ALWAYS,10
+RP_FREE,DR_FREE,ALWAYS,10

data/tariffplans/testtp/RatingProfiles.csv

@@ -3,3 +3,4 @@
 *out,cgrates.org,data,*any,2012-01-01T00:00:00Z,RP_DATA1,,
 *out,cgrates.org,sms,*any,2012-01-01T00:00:00Z,RP_SMS1,,
 *out,cgrates.org,data,datar,2016-01-01T00:00:00Z,RP_DATAr,,
+*out,cgrates.org,call,free,2016-01-01T00:00:00Z,RP_FREE,,