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

.travis.yml

@@ -2,6 +2,8 @@ language: go
 
 go:
   - 1.2
+  - 1.3
+  - tip
 
 script: $TRAVIS_BUILD_DIR/test.sh
 

data/docker/devel/Dockerfile

@@ -0,0 +1,33 @@
+FROM debian:latest
+MAINTAINER Radu Fericean, rif@cgrates.org
+RUN apt-get -y update
+
+# install dependency
+RUN apt-get -y install git bzr mercurial redis-server mysql-server python-pycurl python-mysqldb wget
+
+# add cgrates user
+RUN useradd -c CGRateS -d /var/run/cgrates -s /bin/false -r cgrates
+
+# add freeswitch gpg key
+RUN gpg --keyserver pool.sks-keyservers.net --recv-key D76EDC7725E010CF
+      
+# add freeswitch apt key
+RUN gpg -a --export D76EDC7725E010CF | apt-key add -
+
+# add freeswitch apt repo
+RUN cd /etc/apt/sources.list.d/; wget http://apt.itsyscom.com/conf/freeswitch.apt.list
+      
+# install freeswitch
+RUN apt-get update; apt-get -y install freeswitch-meta-vanilla freeswitch-mod-json-cdr
+
+# install golang
+RUN wget -qO- https://storage.googleapis.com/golang/go1.3.linux-amd64.tar.gz | tar xzf - -C /root/
+
+# add startup script
+ADD start.sh /root/start.sh
+
+# cleanup
+RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+# set start command
+CMD /root/start.sh

data/docker/devel/my.cnf

@@ -0,0 +1,3 @@
+[client]
+user=root
+password=CGRateS.org

data/docker/devel/start.sh

@@ -0,0 +1,29 @@
+export GOROOT=/root/go
+export GOPATH=/root/code
+export PATH=$PATH:$GOROOT/bin:$GOPATH/bin
+
+/etc/init.d/mysql start
+/usr/share/cgrates/tutorials/fs_csv/freeswitch/etc/init.d/freeswitch start
+mysqladmin -u root password CGRateS.org
+
+# create a link to data dir
+ln -s /root/code/src/github.com/cgrates/cgrates/data /usr/share/cgrates
+
+# expand freeswitch json conf
+tar xzf /usr/share/cgrates/tutorials/fs_json/freeswitch/etc/freeswitch_conf.tar.gz
+    
+# expand freeswitch csv 
+tar xzf /usr/share/cgrates/tutorials/fs_csv/freeswitch/etc/freeswitch_conf.tar.gz
+    
+# create link to cgrates dir
+ln -s /root/code/src/github.com/cgrates/cgrates /root/cgr
+
+# create cgr-engine link
+ln -s /root/code/bin/cgr-engine /usr/bin/cgr-engine
+
+cd /usr/share/cgrates/storage/mysql; ./setup_cgr_db.sh root CGRateS.org localhost
+cd /
+
+cgr-engine -config /root/cgr/data/conf/cgrates.cfg &
+
+bash --rcfile /root/.bashrc

data/docker/prod/Dockerfile

@@ -0,0 +1,40 @@
+FROM debian:latest
+MAINTAINER Radu Fericean, rif@cgrates.org
+RUN apt-get -y update
+
+# install dependencies
+RUN apt-get -y install git redis-server mysql-server python-mysqldb wget
+
+# add freeswitch gpg key
+RUN gpg --keyserver pool.sks-keyservers.net --recv-key D76EDC7725E010CF
+      
+# add freeswitch apt key
+RUN gpg -a --export D76EDC7725E010CF | apt-key add -
+
+# add freeswitch apt repo
+RUN cd /etc/apt/sources.list.d/; wget http://apt.itsyscom.com/conf/freeswitch.apt.list
+      
+# install freeswitch
+RUN apt-get update; apt-get -y install freeswitch-meta-vanilla freeswitch-mod-json-cdr
+
+# add cgrates apt-key
+RUN wget -O - http://apt.itsyscom.com/conf/cgrates.gpg.key | apt-key add -
+
+# add cgrates repo
+RUN cd /etc/apt/sources.list.d/; wget http://apt.itsyscom.com/conf/cgrates.apt.list
+
+# install cgrates
+RUN apt-get update; apt-get -y install cgrates
+
+# copy .my.cnf  (do not enable it)
+ADD my.cnf /my.cnf
+
+# add startup script
+ADD start.sh /root/start.sh
+
+# cleanup
+RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+# set start command
+CMD /root/start.sh
+

data/docker/prod/my.cnf

@@ -0,0 +1,3 @@
+[client]
+user=root
+password=CGRateS.org

data/docker/prod/start.sh

@@ -0,0 +1,6 @@
+/etc/init.d/mysql start
+/usr/share/cgrates/tutorials/fs_csv/freeswitch/etc/init.d/freeswitch start
+mysqladmin -u root password CGRateS.org
+cd /usr/share/cgrates/storage/mysql; ./setup_cgr_db.sh root CGRateS.org localhost
+cd /
+bash --rcfile /root/.bashrc

data/vagrant/cgrates_devel.yml

@@ -46,7 +46,7 @@
   user: vagrant
   vars:
     root_db_password: CGRateS.org
-    go_version: 1.2.2
+    go_version: 1.3
   
   tasks:
     - name: get golang

general_tests/placeholder.go

@@ -0,0 +1,2 @@
+package general_tests
+

update_external_libs.sh

@@ -4,7 +4,6 @@ go get -v -u github.com/bmizerany/pq
 go get -v -u github.com/ugorji/go/codec
 go get -v -u labix.org/v2/mgo
 go get -v -u github.com/cgrates/fsock
-go get -v -u github.com/cgrates/liner
 go get -u -v github.com/go-sql-driver/mysql
 go get -u -v github.com/hoisie/redis
 go get -u -v github.com/howeyc/fsnotify