diff --git a/.gitignore b/.gitignore index 54808d456..3283dcc7a 100644 --- a/.gitignore +++ b/.gitignore @@ -17,5 +17,8 @@ data/tutorial_tests/fs_evsock/freeswitch/etc/freeswitch/ vendor *.test # do not save the binary created by the docker build script -data/docker/scratch/cgrates.json -data/docker/scratch/cgr-engine \ No newline at end of file +data/docker/scratch/cgr-engine +data/docker/scratch/cgr-console +data/docker/scratch/cgr-loader +data/docker/scratch/cgr-migrator +data/docker/scratch/cgr-tester \ No newline at end of file diff --git a/data/ansible/docker/ca.crt b/data/ansible/docker/ca.crt deleted file mode 100644 index b0fcb7eae..000000000 --- a/data/ansible/docker/ca.crt +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEDDCCAvSgAwIBAgIJAPMIQXNTuPkzMA0GCSqGSIb3DQEBCwUAMIGaMQswCQYD -VQQGEwJERTEQMA4GA1UECAwHQmF2YXJpYTEYMBYGA1UEBwwPQmFkIFJlaWNoZW5o -YWxsMREwDwYDVQQKDAhJVHN5c0NPTTENMAsGA1UECwwEcm9vdDEYMBYGA1UEAwwP -ZGtyLmNncmF0ZXMub3JnMSMwIQYJKoZIhvcNAQkBFhRjb250YWN0QGl0c3lzY29t -LmNvbTAeFw0yMDAzMDUxNDA2NDhaFw0zMDAzMDMxNDA2NDhaMIGaMQswCQYDVQQG -EwJERTEQMA4GA1UECAwHQmF2YXJpYTEYMBYGA1UEBwwPQmFkIFJlaWNoZW5oYWxs -MREwDwYDVQQKDAhJVHN5c0NPTTENMAsGA1UECwwEcm9vdDEYMBYGA1UEAwwPZGty -LmNncmF0ZXMub3JnMSMwIQYJKoZIhvcNAQkBFhRjb250YWN0QGl0c3lzY29tLmNv -bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+BKO7MNSTqoerYbVcB -fvnCo3oNeV0qxFXECxkLgmXgB86sVLiF3qc6246PWStslajvGtODnMfV4GNZWklW -BW0mqIrU0ZKIaPEeaOPGMDJuFmwdnWHIeHXCIkG1lO1EWI3m3iDNVIPiMAb8yRMc -UaCJJmK40Pb8rHedkO6w4aImQvpLRvopx4y6psvV+fXdnDBXwsvz0Yp+SwmEx5bS -ZjEoZUjY3dSP3WFEsO+QG2ED2sCg3lNnrZE5MKT68bUY+RTYybmeEQiWn+CRKkov -QAkM+Tkmr8x6EZ6NdrE33mYU5sxS9vvY05haDKj698Gy0PbbUQh9/Hx3+RbSgzsd -5ysCAwEAAaNTMFEwHQYDVR0OBBYEFACYtAH/RSDNgd9r1/5I3vlBxm48MB8GA1Ud -IwQYMBaAFACYtAH/RSDNgd9r1/5I3vlBxm48MA8GA1UdEwEB/wQFMAMBAf8wDQYJ -KoZIhvcNAQELBQADggEBACX0baD0OSMBF6zaS0TTtgAYrwopTe0yDhtugrfKJkPX -q7FMeInhHOPHZzz2aufYcln1y76ztvzzd0HdXi4UIW/VEDDfOCBlo7JbkFhOlnZX -Kmd09TPGR0szHMVBsqu4I6Uu27L+JuUT26IgaYUaIZV7F3nSPr2KXmuU1eZSRa6x -qb1HqjS6OTD8Er2C4eZ0zkw5/7rcHg/FZB0bEzNKahthwFRoR5WCLij7gz0fxDxo -RrrYXvw8MwhQwmAk+YN/nwkTzqcgupNvhstWNqn6IgzbN5Fcg17xjsdBkZ9qjg+9 -wFBfKNxvlfg8VBzT4ZG8ExWDhD+phytw3aFa29Io45w= ------END CERTIFICATE----- diff --git a/data/ansible/docker/main.yaml b/data/ansible/docker/main.yaml index 467595330..6378887ec 100644 --- a/data/ansible/docker/main.yaml +++ b/data/ansible/docker/main.yaml @@ -34,6 +34,7 @@ # CGRateS vars cgrates_dir: "{{ golang_gopath }}/src/github.com/cgrates/cgrates" cgrates_branch: "master" + cgrates_distribution: "nightly" dependencies: - build-essential @@ -52,6 +53,10 @@ remote_user: '{{ gouser }}' tasks: + - name: set cgrates distribution + set_fact: + cgrates_distribution: "{{ cgrates_branch }}" + when: cgrates_branch != "master" ########################################################################################################################### ########################################################################################################################### # install dependencies @@ -63,7 +68,7 @@ # Prepare for configuration - name: Check if NGINX needs to be configured become: true - shell: "ls /etc/nginx/sites-enabled | grep 'docker.cgrates.org.vhost'" + shell: "ls /etc/nginx/sites-enabled | grep 'dkr.cgrates.org.vhost'" ignore_errors: true register: nginxConfig @@ -127,14 +132,31 @@ - name: build Docker image become: yes - shell: "docker build -t cgrates {{ cgrates_dir }}/data/docker/scratch/" + shell: + docker build -t cgr-engine -f="cgr-engine.doker" {{ cgrates_dir }}/data/docker/scratch/; + docker build -t cgr-console -f="cgr-console.doker" {{ cgrates_dir }}/data/docker/scratch/; + docker build -t cgr-loader -f="cgr-loader.doker" {{ cgrates_dir }}/data/docker/scratch/; + docker build -t cgr-migrator -f="cgr-migrator.doker" {{ cgrates_dir }}/data/docker/scratch/; + docker build -t cgr-tester -f="cgr-tester.doker" {{ cgrates_dir }}/data/docker/scratch/; args: chdir: '{{ cgrates_dir }}/data/docker/scratch' - name: tag docker image become: yes - shell: "docker tag cgrates 127.0.0.1:5000/cgrates:{{ cgrates_branch }}" + shell: + docker tag cgr-engine 127.0.0.1:5000/cgr-engine:{{ cgrates_distribution }}; + docker tag cgr-console 127.0.0.1:5000/cgr-console:{{ cgrates_distribution }}; + docker tag cgr-loader 127.0.0.1:5000/cgr-loader:{{ cgrates_distribution }}; + docker tag cgr-migrator 127.0.0.1:5000/cgr-migrator:{{ cgrates_distribution }}; + docker tag cgr-tester 127.0.0.1:5000/cgr-tester:{{ cgrates_distribution }}; - name: push docker image to repo become: yes - shell: "docker image push 127.0.0.1:5000/cgrates:{{ cgrates_branch }}" + shell: + docker image push 127.0.0.1:5000/cgr-engine:{{ cgrates_distribution }}; + docker image push 127.0.0.1:5000/cgr-console:{{ cgrates_distribution }}; + docker image push 127.0.0.1:5000/cgr-loader:{{ cgrates_distribution }}; + docker image push 127.0.0.1:5000/cgr-migrator:{{ cgrates_distribution }}; + docker image push 127.0.0.1:5000/cgr-tester:{{ cgrates_distribution }}; + + diff --git a/data/ansible/docker/nginx.conf.j2 b/data/ansible/docker/nginx.conf.j2 index a717d8f13..da78b679a 100644 --- a/data/ansible/docker/nginx.conf.j2 +++ b/data/ansible/docker/nginx.conf.j2 @@ -4,19 +4,9 @@ map $upstream_http_docker_distribution_api_version $docker_distribution_api_vers } server { - listen 80; # ssl; + listen 80; server_name dkr.cgrates.org; - # SSL - # ssl_certificate /etc/nginx/conf.d/domain.crt; - # ssl_certificate_key /etc/nginx/conf.d/domain.key; - - # Recommendations from https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html - # ssl_protocols TLSv1.1 TLSv1.2; - # ssl_ciphers 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH'; - # ssl_prefer_server_ciphers on; - # ssl_session_cache shared:SSL:10m; - access_log /var/log/nginx/docker-error.log; error_log /var/log/nginx/docker-error.log; @@ -48,4 +38,8 @@ server { proxy_set_header X-Forwarded-Proto $scheme; proxy_read_timeout 900; } + + location / { + deny all; + } } diff --git a/data/ansible/docker/nginx.yaml b/data/ansible/docker/nginx.yaml index 15864fbe4..3e6fe2a28 100644 --- a/data/ansible/docker/nginx.yaml +++ b/data/ansible/docker/nginx.yaml @@ -1,19 +1,9 @@ --- -- name: copy certificates nginx +- name: Delete default page become: true - copy: - src: server.crt - dest: "/etc/nginx/conf.d/domain.crt" - mode: '0600' - owner: "{{ rootUser }}" - -- name: copy certificates key nginx - become: true - copy: - src: server.key - dest: "/etc/nginx/conf.d/domain.key" - mode: '0600' - owner: "{{ rootUser }}" + file: + path: "/etc/nginx/sites-enabled/default" + state: absent - name: Add apt.cgrates.vhost in nginx become: true diff --git a/data/ansible/docker/server.crt b/data/ansible/docker/server.crt deleted file mode 100644 index 2f78a9f9d..000000000 --- a/data/ansible/docker/server.crt +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID3zCCAsegAwIBAgIJAMgc8s+Vkiu5MA0GCSqGSIb3DQEBCwUAMIGaMQswCQYD -VQQGEwJERTEQMA4GA1UECAwHQmF2YXJpYTEYMBYGA1UEBwwPQmFkIFJlaWNoZW5o -YWxsMREwDwYDVQQKDAhJVHN5c0NPTTENMAsGA1UECwwEcm9vdDEYMBYGA1UEAwwP -ZGtyLmNncmF0ZXMub3JnMSMwIQYJKoZIhvcNAQkBFhRjb250YWN0QGl0c3lzY29t -LmNvbTAeFw0yMDAzMDUxNDA2NDhaFw0zMDAzMDMxNDA2NDhaMIGcMQswCQYDVQQG -EwJERTEQMA4GA1UECAwHQmF2YXJpYTEYMBYGA1UEBwwPQmFkIFJlaWNoZW5oYWxs -MREwDwYDVQQKDAhJVHN5c0NPTTEPMA0GA1UECwwGc2VydmVyMRgwFgYDVQQDDA9k -a3IuY2dyYXRlcy5vcmcxIzAhBgkqhkiG9w0BCQEWFGNvbnRhY3RAaXRzeXNjb20u -Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoEYBsygGv+60RtKS -zaa9oD9LSGILeggUWyw6nC3dLNlKajDsJSIn6Vv3aB9Kf9MR4X+Vpe50yBxdR8K2 -fdNPedwFTkZrctUWmfIGkmgvfde2kXvMcdvAAWcMqNnZu8xiRD1KxfHQvh/glC/9 -K8lqiMmfKD/tToG9SUbNwhos6HLAkEgR9rSwscRv6jflpG2p/1dCgExwjU2ipGn7 -r8udKqSDJviTaPUo4SU8VeqAPkx6j7xs50tcA+cl06kCJdG2FJlpGuhwjuzt/V30 -9fssv7Fc7cMjqEPqHkKaHzECWTE7UlVIOERf+6+8rZXVlmEZ8JG2Ssj1+WX9uKAA -DaNLUQIDAQABoyQwIjAgBgNVHREEGTAXgg9ka3IuY2dyYXRlcy5vcmeHBH8AAAEw -DQYJKoZIhvcNAQELBQADggEBAESGUFEvlR96lddxgT1NPJ4Ay3a39Qoxl8Mkg0Yb -dCUEWEkyDQxyVmcirUtSEsMjUAMr0+NATEF7Ay43yhO93flSsEru3lvp2QM88iVq -l/Gfz0H6WoE9H9hd8c2E+vpnUzCyLyfntnq3Kg0WgrzHUmNmlE8UcnIuJQAT1zTI -3I639AFL9RtbkYXwqVkWXqp2mq79skqplZlHhgENkhuFWPHq3ZhLzlOlDyl4YNND -6p6VMcxy9aTMrGfGSn0hzrTWO33RfVBVx15UxqBtq0JejLRD6WwgK2dd5RvmZFLC -NrYQnfHREA2/xsW4SyNlFRz1NeFIdNDvSNyHT5XxCSZqvNM= ------END CERTIFICATE----- diff --git a/data/ansible/docker/server.key b/data/ansible/docker/server.key deleted file mode 100644 index 355876c9a..000000000 --- a/data/ansible/docker/server.key +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCgRgGzKAa/7rRG -0pLNpr2gP0tIYgt6CBRbLDqcLd0s2UpqMOwlIifpW/doH0p/0xHhf5Wl7nTIHF1H -wrZ900953AVORmty1RaZ8gaSaC9917aRe8xx28ABZwyo2dm7zGJEPUrF8dC+H+CU -L/0ryWqIyZ8oP+1Ogb1JRs3CGizocsCQSBH2tLCxxG/qN+Wkban/V0KATHCNTaKk -afuvy50qpIMm+JNo9SjhJTxV6oA+THqPvGznS1wD5yXTqQIl0bYUmWka6HCO7O39 -XfT1+yy/sVztwyOoQ+oeQpofMQJZMTtSVUg4RF/7r7ytldWWYRnwkbZKyPX5Zf24 -oAANo0tRAgMBAAECggEAMbBCiqaYIR0CKwrRlIxjMbEtx80NvdGPbgyyRwU5EtRy -66UrMP/72681bsR0tlhbrMt/O6hH8FpK2RqWtT+z3hXGV1Qhr8I8dZHBU9aVErCz -2zrEUXBNgKHQHPEdPcnJlVpjOicUDj2XxJl0JgUV0D6h5zqaecJjSrp2w/yVe6LK -PWgelrJKp6vdm+XBcyWZTy34cWwnJqcHpN2yH4xUAaUkLaEV9/hqXlc75+QDc8F9 -6fWi3hMNmtfxattjz+FryfmT8uXkW0sPJpJ9R99mooCGUv7tN3WxIzNqux7C/nza -oCeaYoEHjZJuq7pjNtPsgDo681nAlfwCw3eikqjqIQKBgQDSMbT9TaFounfyZuDv -bDezsQ+4FWTX2r6A1T84vJjeeE7ySdNFQZAv6d9k0r8U7gV9BuWmS03x46an7Oo6 -RHnZHpQNEr/V+MMNt9dg4JGk0ZkKBjKwPN9Nw8/eIhJqM4jhjw9+5DQ1mctCRSqk -aTF0+UW1bqUoHyzfiPNwGY2qVQKBgQDDM1P02T7O/AeauNiLg6T1nZdAPQjNTbWI -OHu9XYItxo4KMFz5xfGbEEz+zyWH5HzlWZ7/0MIf49rVnDIIujFwNVRitCVjQlUw -KHm0FQ0EkTIXpEqe7xLBfGJ7S5i76hab34Sm55zT1x61866dFwWFAueRtgEhcSJn -ZZh6WpoRDQKBgBxf523WX/ayTWTkrHLFqhNQ0K1p/e4BsnvTzbAMDZripM2iV6ne -uucs7CJBLNhXdVg2aSP0wHXp5GKA4fGxsr0zmorVQB5TcYlVivah+idEwCMRSSBv -ZzmpOFNlSBUcFdtVI6NejQm7VCwDCEmfhbSjvdxLLnJnGvimFS7J1EztAoGAEcE0 -bLvp25fO9ULE54O02GZaIIyspUfhMB+7GZFMyu8ZclHN0yYvAKSt7CtZRZAB0Daj -oK8TSSVHfVB0uJh+8K7ZGxU5pVqeNwAnebrEcVrnjID0DJrAQPsYVhCdNtJm9gyR -m0DL4fTaJUCh7EXwyZVnDLjaR3lr4K27/b0J8G0CgYEAr3i6sZ6eGtIUefAqWg8J -hWysE6BSA5CnxLsU/eUMY6EYE3Tup/dT5N/MFXQyJvtx/L4wmCXrVSUOereK7gVM -Jg+NDS5Likssu4CnwiRI5omislqMxxHZWl/EvE4yi/ZJ+ZemGfyR5UJPAbssE/2l -vAY/GWwlQM7c68F2zDU1UgU= ------END PRIVATE KEY----- diff --git a/data/docker/scratch/Dockerfile b/data/docker/scratch/Dockerfile deleted file mode 100644 index 1edcb69fb..000000000 --- a/data/docker/scratch/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM scratch -ADD ./cgr-engine / -ADD ./cgrates.json /etc/cgrates/ -CMD ["/cgr-engine","--logger=*stdout","-httprof_path=/pprof"] diff --git a/data/docker/scratch/Makefile b/data/docker/scratch/Makefile deleted file mode 100644 index e38a36f05..000000000 --- a/data/docker/scratch/Makefile +++ /dev/null @@ -1,9 +0,0 @@ - -generate: - ./build.sh - cp ../../conf/cgrates/cgrates.json ./cgrates.json -build: - docker build -t cgrates . -run: build - docker run --rm -itv `pwd`:/root/code -p 2080:2080 -p 2012:2012 --name cgr cgrates -.PHONY: generate,build,run diff --git a/data/docker/scratch/build.sh b/data/docker/scratch/build.sh old mode 100644 new mode 100755 index 116a67e53..c9c1b1743 --- a/data/docker/scratch/build.sh +++ b/data/docker/scratch/build.sh @@ -1,5 +1,5 @@ #! /usr/bin/env sh -echo "Building CGRateS ..." +echo "Static building CGRateS..." GIT_LAST_LOG=$(git log -1 | tr -d "'") @@ -12,5 +12,13 @@ fi GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o cgr-engine -a -ldflags '-extldflags "-f no-PIC -static"' -tags 'osusergo netgo static_build' -ldflags "-X 'github.com/cgrates/cgrates/utils.GitLastLog=$GIT_LAST_LOG'" github.com/cgrates/cgrates/cmd/cgr-engine cr=$? +GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o cgr-loader -a -ldflags '-extldflags "-f no-PIC -static"' -tags 'osusergo netgo static_build' -ldflags "-X 'github.com/cgrates/cgrates/utils.GitLastLog=$GIT_LAST_LOG'" github.com/cgrates/cgrates/cmd/cgr-loader +cl=$? +GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o cgr-console -a -ldflags '-extldflags "-f no-PIC -static"' -tags 'osusergo netgo static_build' -ldflags "-X 'github.com/cgrates/cgrates/utils.GitLastLog=$GIT_LAST_LOG'" github.com/cgrates/cgrates/cmd/cgr-console +cc=$? +GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o cgr-migrator -a -ldflags '-extldflags "-f no-PIC -static"' -tags 'osusergo netgo static_build' -ldflags "-X 'github.com/cgrates/cgrates/utils.GitLastLog=$GIT_LAST_LOG'" github.com/cgrates/cgrates/cmd/cgr-migrator +cm=$? +GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o cgr-tester -a -ldflags '-extldflags "-f no-PIC -static"' -tags 'osusergo netgo static_build' -ldflags "-X 'github.com/cgrates/cgrates/utils.GitLastLog=$GIT_LAST_LOG'" github.com/cgrates/cgrates/cmd/cgr-tester +ct=$? -exit $cr +exit $cr || $cl || $cc || $cm || $ct diff --git a/data/docker/scratch/cgr-console.doker b/data/docker/scratch/cgr-console.doker new file mode 100644 index 000000000..a20dc9ac3 --- /dev/null +++ b/data/docker/scratch/cgr-console.doker @@ -0,0 +1,2 @@ +FROM scratch +ADD ./cgr-console / diff --git a/data/docker/scratch/cgr-engine.doker b/data/docker/scratch/cgr-engine.doker new file mode 100644 index 000000000..544ff4071 --- /dev/null +++ b/data/docker/scratch/cgr-engine.doker @@ -0,0 +1,2 @@ +FROM scratch +ADD ./cgr-engine / diff --git a/data/docker/scratch/cgr-loader.doker b/data/docker/scratch/cgr-loader.doker new file mode 100644 index 000000000..b482416bf --- /dev/null +++ b/data/docker/scratch/cgr-loader.doker @@ -0,0 +1,2 @@ +FROM scratch +ADD ./cgr-loader / diff --git a/data/docker/scratch/cgr-migrator.doker b/data/docker/scratch/cgr-migrator.doker new file mode 100644 index 000000000..ed1d266d1 --- /dev/null +++ b/data/docker/scratch/cgr-migrator.doker @@ -0,0 +1,2 @@ +FROM scratch +ADD ./cgr-migrator / diff --git a/data/docker/scratch/cgr-tester.doker b/data/docker/scratch/cgr-tester.doker new file mode 100644 index 000000000..397f0d3a4 --- /dev/null +++ b/data/docker/scratch/cgr-tester.doker @@ -0,0 +1,2 @@ +FROM scratch +ADD ./cgr-tester / diff --git a/engine/action.go b/engine/action.go index 76071ef00..5cb7cdbf0 100644 --- a/engine/action.go +++ b/engine/action.go @@ -86,7 +86,7 @@ func getActionFunc(typ string) (actionTypeFunc, bool) { utils.RESET_COUNTERS: resetCountersAction, utils.ENABLE_ACCOUNT: enableAccountAction, utils.DISABLE_ACCOUNT: disableAccountAction, - utils.HttpPost: callURL, + utils.MetaHTTPPost: callURL, utils.HttpPostAsync: callURLAsync, utils.MAIL_ASYNC: mailAsync, utils.SET_DDESTINATIONS: setddestinations, diff --git a/utils/consts.go b/utils/consts.go index 434625f6b..375dae047 100755 --- a/utils/consts.go +++ b/utils/consts.go @@ -808,7 +808,6 @@ const ( RESET_COUNTERS = "*reset_counters" ENABLE_ACCOUNT = "*enable_account" DISABLE_ACCOUNT = "*disable_account" - HttpPost = "*http_post" HttpPostAsync = "*http_post_async" MAIL_ASYNC = "*mail_async" UNLIMITED = "*unlimited"