diff --git a/ansible-playbook.sh b/ansible-playbook.sh index c64ecda43cee2480c7b4a10960f729da0198f87d..729433b4bae70278c448323113074acf4af727b8 100755 --- a/ansible-playbook.sh +++ b/ansible-playbook.sh @@ -1,6 +1,9 @@ #!/bin/bash -SECRETS="$( cd ~/.ansible && pwd )/secrets" +if [ -d ~/.ansible ] + then + SECRETS="$( cd ~/.ansible && pwd )/secrets" +fi cd $( cd $(dirname $(realpath $0)) ; pwd ) if [ $1 == "local" ] diff --git a/ansible.sh b/ansible.sh index a33ed0a5bc6387c3c22eb515c081458f447514e4..629343c14a9732f1cc106f94903aa26f1c82a6a0 100755 --- a/ansible.sh +++ b/ansible.sh @@ -1,6 +1,9 @@ #!/bin/bash -SECRETS="$( cd ~/.ansible && pwd )/secrets" +if [ -d ~/.ansible ] + then + SECRETS="$( cd ~/.ansible && pwd )/secrets" +fi cd $( cd $(dirname $(realpath $0)) ; pwd ) if [ -f ./inventory/inventory ] diff --git a/setup_local.yml b/setup_local.yml index 0bcd65833b8bce258cafe5b0c6bcacf7371a0566..47296b3d9c68aa103fe02eaba43fb269d892d6b0 100644 --- a/setup_local.yml +++ b/setup_local.yml @@ -15,9 +15,9 @@ repo: "git@gitlab.paragon-es.de" plugins: - name: "jiffybox" - repo: "git@github.com:jurgenhaas/ansible-plugin-jiffybox.git" + repo: "{{ repo }}:ansible-plugins/jiffybox.git" - name: "serverdensity" - repo: "git@github.com:jurgenhaas/ansible-plugin-serverdensity.git" + repo: "{{ repo }}:ansible-plugins/serverdensity.git" tasks: - name: "Get other repositories" git: @@ -33,6 +33,8 @@ force: no - repo: "{{ repo }}:ansible-roles/gitlab.git" dest: "./roles/gitlab" + - repo: "{{ repo }}:ansible-roles/serverdensity.git" + dest: "./roles/serverdensity" - name: "Get plugins" git: accept_hostkey: yes