You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2021/05/27 21:25:50 UTC

[airavata] branch develop updated (ee49f05 -> c326b23)

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.


    from ee49f05  Merge branch 'yum-cron-security' into develop
     new ffaa64c  Ansible: move check-domains.sh to zabbix role
     new 371d7f5  Merge branch 'yum-cron-security' into develop
     new c326b23  Ansible: removing invalid line

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 dev-tools/ansible/inventories/scigap/develop/hosts                | 1 -
 dev-tools/ansible/roles/letsencrypt/tasks/main.yml                | 8 --------
 .../roles/{letsencrypt/tasks => zabbix}/files/check-domains.sh    | 0
 dev-tools/ansible/roles/zabbix/tasks/main.yml                     | 7 +++++++
 4 files changed, 7 insertions(+), 9 deletions(-)
 rename dev-tools/ansible/roles/{letsencrypt/tasks => zabbix}/files/check-domains.sh (100%)

[airavata] 03/03: Ansible: removing invalid line

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit c326b23f29c11fe9a4df067d6f52117cdd176fc1
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu May 27 17:25:38 2021 -0400

    Ansible: removing invalid line
---
 dev-tools/ansible/inventories/scigap/develop/hosts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-tools/ansible/inventories/scigap/develop/hosts b/dev-tools/ansible/inventories/scigap/develop/hosts
index dcf63df..0fe4dd9 100644
--- a/dev-tools/ansible/inventories/scigap/develop/hosts
+++ b/dev-tools/ansible/inventories/scigap/develop/hosts
@@ -1,4 +1,3 @@
----
 # inventory file : scigap develop deployment
 
 [zookeeper]

[airavata] 02/03: Merge branch 'yum-cron-security' into develop

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit 371d7f5f6a85037f4fc3cbab44ac4ef30e962a4c
Merge: ee49f05 ffaa64c
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu May 27 17:11:44 2021 -0400

    Merge branch 'yum-cron-security' into develop

 dev-tools/ansible/roles/letsencrypt/tasks/main.yml                | 8 --------
 .../roles/{letsencrypt/tasks => zabbix}/files/check-domains.sh    | 0
 dev-tools/ansible/roles/zabbix/tasks/main.yml                     | 7 +++++++
 3 files changed, 7 insertions(+), 8 deletions(-)

[airavata] 01/03: Ansible: move check-domains.sh to zabbix role

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit ffaa64ca529e07c4ee6231da6521f08e5b3e5fd4
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu May 27 17:11:23 2021 -0400

    Ansible: move check-domains.sh to zabbix role
---
 dev-tools/ansible/roles/letsencrypt/tasks/main.yml                | 8 --------
 .../roles/{letsencrypt/tasks => zabbix}/files/check-domains.sh    | 0
 dev-tools/ansible/roles/zabbix/tasks/main.yml                     | 7 +++++++
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/dev-tools/ansible/roles/letsencrypt/tasks/main.yml b/dev-tools/ansible/roles/letsencrypt/tasks/main.yml
index afb118d..2f6ea87 100644
--- a/dev-tools/ansible/roles/letsencrypt/tasks/main.yml
+++ b/dev-tools/ansible/roles/letsencrypt/tasks/main.yml
@@ -64,11 +64,3 @@
   become: true
   become_user: root
   when: ansible_os_family == "RedHat"
-
-- name: copy check-domains.sh script (Zabbix remote command)
-  copy:
-    src: check-domains.sh
-    dest: /usr/local/bin/check-domains.sh
-    mode: 0755
-  become: yes
-  become_user: root
diff --git a/dev-tools/ansible/roles/letsencrypt/tasks/files/check-domains.sh b/dev-tools/ansible/roles/zabbix/files/check-domains.sh
similarity index 100%
rename from dev-tools/ansible/roles/letsencrypt/tasks/files/check-domains.sh
rename to dev-tools/ansible/roles/zabbix/files/check-domains.sh
diff --git a/dev-tools/ansible/roles/zabbix/tasks/main.yml b/dev-tools/ansible/roles/zabbix/tasks/main.yml
index cbb670e..04a047e 100644
--- a/dev-tools/ansible/roles/zabbix/tasks/main.yml
+++ b/dev-tools/ansible/roles/zabbix/tasks/main.yml
@@ -63,4 +63,11 @@
   become: yes
   become_user: root
 
+- name: copy check-domains.sh script (Zabbix remote command)
+  copy:
+    src: check-domains.sh
+    dest: /usr/local/bin/check-domains.sh
+    mode: 0755
+  become: yes
+  become_user: root
 ...