Merge pull request '🚚 requirements: Use namespaced role names' (#466) from alex/netz39-infra-ansible:alex/requirements into master
Reviewed-on: Netz39_Admin/netz39-infra-ansible#466 Reviewed-by: dkdent <dkdent@netz39.de> Reviewed-by: Stefan Haun <tux@netz39.de>
This commit is contained in:
commit
5e97232b90
8 changed files with 19 additions and 15 deletions
|
@ -8,7 +8,7 @@
|
||||||
ansible_python_interpreter: /usr/bin/python3
|
ansible_python_interpreter: /usr/bin/python3
|
||||||
|
|
||||||
roles:
|
roles:
|
||||||
- role: ansible.timezone
|
- role: adriagalin.timezone
|
||||||
vars:
|
vars:
|
||||||
ag_timezone: "{{ timezone }}"
|
ag_timezone: "{{ timezone }}"
|
||||||
- role: users
|
- role: users
|
||||||
|
|
|
@ -22,12 +22,12 @@
|
||||||
# role 'docker_setup' applied through group 'docker_host'
|
# role 'docker_setup' applied through group 'docker_host'
|
||||||
- role: apache
|
- role: apache
|
||||||
- role: apache_letsencrypt # Uses configuration from dehydrated setup
|
- role: apache_letsencrypt # Uses configuration from dehydrated setup
|
||||||
- role: ansible-role-dehydrated
|
- role: 24367dfa.dehydrated
|
||||||
vars:
|
vars:
|
||||||
dehydrated_contact_email: "{{ server_admin }}"
|
dehydrated_contact_email: "{{ server_admin }}"
|
||||||
dehydrated_domains:
|
dehydrated_domains:
|
||||||
- name: entities-validation.svc.n39.eu
|
- name: entities-validation.svc.n39.eu
|
||||||
- role: ansible-role-dehydrated_cron
|
- role: penguineer.dehydrated_cron
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
door_open_command: '/home/pi/sesame-open.sh'
|
door_open_command: '/home/pi/sesame-open.sh'
|
||||||
ble_keykeeper_dir: '/home/pi/netz39_ble_keykeeper'
|
ble_keykeeper_dir: '/home/pi/netz39_ble_keykeeper'
|
||||||
roles:
|
roles:
|
||||||
- role: ble-keykeeper-role
|
- role: maz3max.ble_keykeeper
|
||||||
vars:
|
vars:
|
||||||
ble_keykeeper_user: "{{ gatekeeper_user }}"
|
ble_keykeeper_user: "{{ gatekeeper_user }}"
|
||||||
ble_keykeeper_group: "{{ gatekeeper_user }}"
|
ble_keykeeper_group: "{{ gatekeeper_user }}"
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
# role 'docker_setup' applied through group 'docker_host'
|
# role 'docker_setup' applied through group 'docker_host'
|
||||||
- role: apache
|
- role: apache
|
||||||
- role: apache_letsencrypt # Uses configuration from dehydrated setup
|
- role: apache_letsencrypt # Uses configuration from dehydrated setup
|
||||||
- role: ansible-role-dehydrated
|
- role: 24367dfa.dehydrated
|
||||||
vars:
|
vars:
|
||||||
dehydrated_contact_email: "{{ server_admin }}"
|
dehydrated_contact_email: "{{ server_admin }}"
|
||||||
dehydrated_domains:
|
dehydrated_domains:
|
||||||
|
@ -25,7 +25,7 @@
|
||||||
- name: "{{ grafana_domain_name }}"
|
- name: "{{ grafana_domain_name }}"
|
||||||
- name: "{{ homebox_domain_name }}"
|
- name: "{{ homebox_domain_name }}"
|
||||||
- name: spaceapi.n39.eu
|
- name: spaceapi.n39.eu
|
||||||
- role: ansible-role-dehydrated_cron
|
- role: penguineer.dehydrated_cron
|
||||||
- role: dd24_dyndns_cron
|
- role: dd24_dyndns_cron
|
||||||
# variables are set in the inventory
|
# variables are set in the inventory
|
||||||
- role: desec_dyndns_cron
|
- role: desec_dyndns_cron
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
# role 'docker_setup' applied through group 'docker_host'
|
# role 'docker_setup' applied through group 'docker_host'
|
||||||
- role: apache
|
- role: apache
|
||||||
- role: apache_letsencrypt # Uses configuration from dehydrated setup
|
- role: apache_letsencrypt # Uses configuration from dehydrated setup
|
||||||
- role: ansible-role-dehydrated
|
- role: 24367dfa.dehydrated
|
||||||
vars:
|
vars:
|
||||||
dehydrated_contact_email: "{{ server_admin }}"
|
dehydrated_contact_email: "{{ server_admin }}"
|
||||||
dehydrated_domains:
|
dehydrated_domains:
|
||||||
|
@ -32,7 +32,7 @@
|
||||||
- name: rabbitmq.n39.eu
|
- name: rabbitmq.n39.eu
|
||||||
- name: pwr-meter-pulse-gw-19i.svc.n39.eu
|
- name: pwr-meter-pulse-gw-19i.svc.n39.eu
|
||||||
- name: labelprinter.n39.eu
|
- name: labelprinter.n39.eu
|
||||||
- role: ansible-role-dehydrated_cron
|
- role: penguineer.dehydrated_cron
|
||||||
|
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
roles:
|
roles:
|
||||||
# role 'docker_setup' applied through group 'docker_host'
|
# role 'docker_setup' applied through group 'docker_host'
|
||||||
- role: apache
|
- role: apache
|
||||||
- role: ansible-role-dehydrated_cron
|
- role: penguineer.dehydrated_cron
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
- name: Setup docker network
|
- name: Setup docker network
|
||||||
|
@ -35,7 +35,7 @@
|
||||||
|
|
||||||
- name: Setup Dehydrated
|
- name: Setup Dehydrated
|
||||||
include_role:
|
include_role:
|
||||||
name: ansible-role-dehydrated
|
name: 24367dfa.dehydrated
|
||||||
vars:
|
vars:
|
||||||
dehydrated_contact_email: "{{ server_admin }}"
|
dehydrated_contact_email: "{{ server_admin }}"
|
||||||
dehydrated_domains:
|
dehydrated_domains:
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
docker_data_root: "/srv/docker"
|
docker_data_root: "/srv/docker"
|
||||||
- role: apache
|
- role: apache
|
||||||
- role: apache_letsencrypt # Uses configuration from dehydrated setup
|
- role: apache_letsencrypt # Uses configuration from dehydrated setup
|
||||||
- role: ansible-role-dehydrated
|
- role: 24367dfa.dehydrated
|
||||||
vars:
|
vars:
|
||||||
dehydrated_contact_email: "{{ server_admin }}"
|
dehydrated_contact_email: "{{ server_admin }}"
|
||||||
- role: penguineer.dehydrated_cron
|
- role: penguineer.dehydrated_cron
|
||||||
|
|
|
@ -2,13 +2,17 @@
|
||||||
roles:
|
roles:
|
||||||
- src: hifis.unattended_upgrades
|
- src: hifis.unattended_upgrades
|
||||||
version: v3.2.1
|
version: v3.2.1
|
||||||
- src: git+https://github.com/adriagalin/ansible.timezone.git
|
- name: adriagalin.timezone
|
||||||
|
src: git+https://github.com/adriagalin/ansible.timezone.git
|
||||||
version: 4.0.0
|
version: 4.0.0
|
||||||
- src: git+https://github.com/24367dfa/ansible-role-dehydrated.git
|
- name: 24367dfa.dehydrated
|
||||||
|
src: git+https://github.com/24367dfa/ansible-role-dehydrated.git
|
||||||
version: 2.0.0
|
version: 2.0.0
|
||||||
- src: https://github.com/penguineer/ansible-role-dehydrated_cron.git
|
- name: penguineer.dehydrated_cron
|
||||||
|
src: https://github.com/penguineer/ansible-role-dehydrated_cron.git
|
||||||
version: v1.1.0
|
version: v1.1.0
|
||||||
- src: git+https://github.com/maz3max/ble-keykeeper-role.git
|
- name: maz3max.ble_keykeeper
|
||||||
|
src: git+https://github.com/maz3max/ble-keykeeper-role.git
|
||||||
version: v1.1.0
|
version: v1.1.0
|
||||||
- src: lespocky.telegraf_docker_in_docker
|
- src: lespocky.telegraf_docker_in_docker
|
||||||
version: v0.2.1
|
version: v0.2.1
|
||||||
|
|
Loading…
Add table
Reference in a new issue