diff --git a/site.yml b/site.yml index ca70bd1f7712c6f54d437522b7f1be6109013fcc..89ef6e691f4bba63a4e0bf83aadb0fb454b95f2c 100644 --- a/site.yml +++ b/site.yml @@ -9,6 +9,4 @@ - import_playbook: webserver/main.yml - import_playbook: webserver-test/main.yml - - \ No newline at end of file diff --git a/warpsrvint/docker_grafana/tasks/main.yml b/warpsrvint/docker_grafana/tasks/main.yml index a5b49db97286d2f1c62213c99a82f8c9e17544b5..cc10bfbfe0a316168a7b15877e85ba67ce53ab5a 100644 --- a/warpsrvint/docker_grafana/tasks/main.yml +++ b/warpsrvint/docker_grafana/tasks/main.yml @@ -1,6 +1,6 @@ --- # Get secrets -- import_playbook: ../functions/get_secret.yml +- include_tasks: ../functions/get_secret.yml with_items: - { path: /srv/ldap/secret/ldap_readonly_pass, length: 24 } - { path: /srv/grafana/grafana_admin_pass, length: 12 } diff --git a/warpsrvint/docker_influx/tasks/main.yml b/warpsrvint/docker_influx/tasks/main.yml index e82cb1c6c418853638a0f2d3d0d2d4739a14f0f0..5380b14daea1f606b28c3cb34589b1e90152aa6b 100644 --- a/warpsrvint/docker_influx/tasks/main.yml +++ b/warpsrvint/docker_influx/tasks/main.yml @@ -1,6 +1,6 @@ --- -- import_playbook: ../functions/get_secret.yml +- include_tasks: ../functions/get_secret.yml with_items: - { path: /srv/influx/influx_admin_pw, length: 24 } diff --git a/warpsrvint/docker_kapacitor/tasks/main.yaml b/warpsrvint/docker_kapacitor/tasks/main.yaml index 0e3abc3a82c6b39c82b03934ee7b900d6b75398c..c7a303121346878f211a4521740e164ae9fee859 100644 --- a/warpsrvint/docker_kapacitor/tasks/main.yaml +++ b/warpsrvint/docker_kapacitor/tasks/main.yaml @@ -1,5 +1,5 @@ --- -- import_playbook: ../functions/get_secret.yml +- include_tasks: ../functions/get_secret.yml with_items: - { path: /srv/influx/influx_admin_pw, length: 24 } - { path: /srv/kapacitor/alerta_token, length: -1 } diff --git a/warpsrvint/docker_l4z0r/tasks/main.yml b/warpsrvint/docker_l4z0r/tasks/main.yml index f338cd4fce9f4c3731f5a9af68e9df2aaed4464e..6800a43f60b77eb791b490a58c43b565f28a3afd 100644 --- a/warpsrvint/docker_l4z0r/tasks/main.yml +++ b/warpsrvint/docker_l4z0r/tasks/main.yml @@ -10,7 +10,7 @@ - "/srv/l4z0r/db" # Get secrets -- import_playbook: ../functions/get_secret.yml +- include_tasks: ../functions/get_secret.yml with_items: - { path: /srv/l4z0r/mysql_root_pw, length: 24 } - { path: /srv/l4z0r/mysql_user_pw, length: 12 } diff --git a/warpsrvint/docker_librenms/tasks/main.yml b/warpsrvint/docker_librenms/tasks/main.yml index d47671a1458590b7bebcee5ae31f2d67d6f447fb..455bed45e253050a10966a6cd038926c060582ac 100644 --- a/warpsrvint/docker_librenms/tasks/main.yml +++ b/warpsrvint/docker_librenms/tasks/main.yml @@ -1,7 +1,7 @@ --- # Get secrets -- import_playbook: ../functions/get_secret.yml +- include_tasks: ../functions/get_secret.yml with_items: - { path: /srv/librenms/mysql_root_pw, length: 24 } - { path: /srv/librenms/mysql_user_pw, length: 12 } diff --git a/warpsrvint/docker_matestatdb/tasks/main.yml b/warpsrvint/docker_matestatdb/tasks/main.yml index ad3914b374f0e6a9ff8e31a6d10a0d0e0eb5db5c..7d17615d1a7f898d39cb8df4c2724c7f79cfcc41 100644 --- a/warpsrvint/docker_matestatdb/tasks/main.yml +++ b/warpsrvint/docker_matestatdb/tasks/main.yml @@ -1,6 +1,6 @@ --- # Get secrets -- import_playbook: ../functions/get_secret.yml +- include_tasks: ../functions/get_secret.yml with_items: - { path: /srv/matestatdb/postgres_admin_pw, length: 24 } diff --git a/webserver/docker_alerta/tasks/main.yml b/webserver/docker_alerta/tasks/main.yml index 3b60c2e4feb9d7cbe7e01107763e9096454f2dd4..77e0b5fa870f04b987369acd2a350d0ef72cb097 100644 --- a/webserver/docker_alerta/tasks/main.yml +++ b/webserver/docker_alerta/tasks/main.yml @@ -1,6 +1,6 @@ --- -- import_playbook: ../functions/get_secret.yml +- include_tasks: ../functions/get_secret.yml with_items: - { path: /srv/alerta/alerta_secret_key, length: 24 } - { path: /srv/alerta/alerta_oauth_client_secret, length: -1 } diff --git a/webserver/docker_hackmd/tasks/main.yml b/webserver/docker_hackmd/tasks/main.yml index 79c234e710b034e3e9546fdb1b5fab72a9c6eaf0..3cbd0880a27106c19e882a9f3ce1777412f468cb 100644 --- a/webserver/docker_hackmd/tasks/main.yml +++ b/webserver/docker_hackmd/tasks/main.yml @@ -1,6 +1,6 @@ --- -- import_playbook: ../functions/get_secret.yml +- include_tasks: ../functions/get_secret.yml with_items: - { path: /srv/hackmd/mysql_root_pass, length: 24 } - { path: /srv/hackmd/mysql_user_pass, length: 12 } diff --git a/webserver/docker_keycloak/tasks/main.yml b/webserver/docker_keycloak/tasks/main.yml index 30cd4861c49758c154ac980e9fb79546619ccaff..e7be09688b4a51199908fbcbd37f76f4d6aed88b 100644 --- a/webserver/docker_keycloak/tasks/main.yml +++ b/webserver/docker_keycloak/tasks/main.yml @@ -1,6 +1,6 @@ --- -- import_playbook: ../functions/get_secret.yml +- include_tasks: ../functions/get_secret.yml with_items: - { path: /srv/keycloak/keycloak_admin_pass, length: 24 } - { path: /srv/keycloak/postgres_user_pass, length: 12 }