From fbe8e66e32c4e86b56f3a30bc6f4019c94b4af15 Mon Sep 17 00:00:00 2001
From: TeoV <teofil.voivozeanu@itsyscom.com>
Date: Wed, 19 Feb 2020 09:25:56 +0200
Subject: [PATCH] Update ansible script for PkgServer to use nightly instead of
 master

---
 data/ansible/deb_packages/main.yaml | 16 ++++++++--------
 data/ansible/rpm_packages/main.yaml | 16 ++++++++--------
 docs/installation.rst               |  4 ++--
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/data/ansible/deb_packages/main.yaml b/data/ansible/deb_packages/main.yaml
index bbbe73ce7..d93d4b32b 100644
--- a/data/ansible/deb_packages/main.yaml
+++ b/data/ansible/deb_packages/main.yaml
@@ -224,30 +224,30 @@
 - hosts: pkg
   remote_user: '{{ gouser }}'
   tasks:
-    - name: set cgrates cgrates_version
+    - name: set cgrates cgrates_distribution
       set_fact:
-        cgrates_version: "{{ hostvars['apt']['cgrates_version'] }}"
+        cgrates_distribution: "{{ hostvars['apt']['cgrates_distribution'] }}"
 
     - name: Creates directory
       become: yes
       file:
-        path: /var/packages/deb/{{ cgrates_version }}/
+        path: /var/packages/deb/{{ cgrates_distribution }}/
         state: directory
         
     - name: Remove symlink from current deb package
       become: yes
       file:
-        path: /var/packages/deb/{{ cgrates_version }}/cgrates_current_amd64.deb
+        path: /var/packages/deb/{{ cgrates_distribution }}/cgrates_current_amd64.deb
         state: absent
-      when : cgrates_version == "master" or hostvars['apt']['gitTagVar'].stdout_lines|length > 0
+      when : cgrates_distribution == "nightly" or hostvars['apt']['gitTagVar'].stdout_lines|length > 0
 
     - name: Move the new package to /var/packages/deb
       become: yes
-      shell: "sudo mv /tmp/{{ item}} /var/packages/deb/{{ cgrates_version }}/"
+      shell: "sudo mv /tmp/{{ item}} /var/packages/deb/{{ cgrates_distribution }}/"
       with_items: "{{ hostvars['apt']['debFileName']['stdout_lines'] }}"
 
     - name: Create the new symlink cgrates_current_amd64.deb
       become: yes
-      shell: "sudo ln -s /var/packages/deb/{{ cgrates_version }}/{{ item }} /var/packages/deb/{{ cgrates_version }}/cgrates_current_amd64.deb"
+      shell: "sudo ln -s /var/packages/deb/{{ cgrates_distribution }}/{{ item }} /var/packages/deb/{{ cgrates_distribution }}/cgrates_current_amd64.deb"
       with_items: "{{ hostvars['apt']['debFileName']['stdout_lines'] }}"
-      when : cgrates_version == "master" or hostvars['apt']['gitTagVar'].stdout_lines|length > 0
+      when : cgrates_distribution == "nightly" or hostvars['apt']['gitTagVar'].stdout_lines|length > 0
diff --git a/data/ansible/rpm_packages/main.yaml b/data/ansible/rpm_packages/main.yaml
index 494a037cd..971b00c15 100644
--- a/data/ansible/rpm_packages/main.yaml
+++ b/data/ansible/rpm_packages/main.yaml
@@ -271,28 +271,28 @@
 - hosts: pkg
   remote_user: '{{ gouser }}'
   tasks:
-    - name: set cgrates cgrates_version
+    - name: set cgrates cgrates_distribution
       set_fact:
-        cgrates_version: "{{ hostvars['yum']['cgrates_version'] }}"
+        cgrates_distribution: "{{ hostvars['yum']['cgrates_distribution'] }}"
 
     - name: Creates directory
       become: yes
       file:
-        path: /var/packages/rpm/{{ cgrates_version }}/
+        path: /var/packages/rpm/{{ cgrates_distribution }}/
         state: directory
         
     - name: Remove symlink from current rpm package
       become: yes
       file:
-        path: /var/packages/rpm/{{ cgrates_version }}/cgrates_current.rpm
+        path: /var/packages/rpm/{{ cgrates_distribution }}/cgrates_current.rpm
         state: absent
-      when : cgrates_version == "master" or hostvars['yum']['gitTagVar'].stdout_lines|length > 0
+      when : cgrates_distribution == "nightly" or hostvars['yum']['gitTagVar'].stdout_lines|length > 0
 
     - name: Move the new package to /var/packages/rpm
       become: yes
-      shell: "sudo mv /tmp/{{ hostvars['yum']['rmpFileName']['stdout_lines'][0] }} /var/packages/rpm/{{ cgrates_version }}/"
+      shell: "sudo mv /tmp/{{ hostvars['yum']['rmpFileName']['stdout_lines'][0] }} /var/packages/rpm/{{ cgrates_distribution }}/"
 
     - name: Create the new symlink cgrates_current.rpm
       become: yes
-      shell: "sudo ln -s /var/packages/rpm/{{ cgrates_version }}/{{ hostvars['yum']['rmpFileName']['stdout_lines'][0] }} /var/packages/rpm/{{ cgrates_version }}/cgrates_current.rpm"
-      when : cgrates_version == "master" or hostvars['yum']['gitTagVar'].stdout_lines|length > 0
+      shell: "sudo ln -s /var/packages/rpm/{{ cgrates_distribution }}/{{ hostvars['yum']['rmpFileName']['stdout_lines'][0] }} /var/packages/rpm/{{ cgrates_distribution }}/cgrates_current.rpm"
+      when : cgrates_distribution == "nightly" or hostvars['yum']['gitTagVar'].stdout_lines|length > 0
diff --git a/docs/installation.rst b/docs/installation.rst
index c7661f92c..add4e1753 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -57,7 +57,7 @@ Run the following commands:
 
 ::
 
-    wget http://pkg.cgrates.org/deb/master/cgrates_current_amd64.deb
+    wget http://pkg.cgrates.org/deb/nightly/cgrates_current_amd64.deb
     dpkg -i cgrates_current_amd64.deb
 
 As a side note on http://pkg.cgrates.org one can find an entire archive of CGRateS packages.
@@ -100,7 +100,7 @@ Run the following commands:
 
 ::
 
-    sudo rpm -i http://pkg.cgrates.org/rpm/master/cgrates_current.rpm
+    sudo rpm -i http://pkg.cgrates.org/rpm/nightly/cgrates_current.rpm
 
 As a side note on http://pkg.cgrates.org one can find an entire archive of CGRateS packages.