Merge branch 'hello_services' into 'master'
Hello services :) See merge request nounous/ansible!11certbot_on_virtu
						commit
						c166f33507
					
				| 
						 | 
					@ -13,10 +13,16 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # Debian non-free mirror
 | 
					    # Debian non-free mirror
 | 
				
			||||||
    debian_mirror: http://mirror.adm.crans.org/debian
 | 
					    debian_mirror: http://mirror.adm.crans.org/debian
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Indicate service in motd
 | 
				
			||||||
 | 
					    motd_role:
 | 
				
			||||||
 | 
					      name: prometheus
 | 
				
			||||||
 | 
					      path: /etc/prometheus/
 | 
				
			||||||
  roles:
 | 
					  roles:
 | 
				
			||||||
    - debian-non-free
 | 
					    - debian-non-free
 | 
				
			||||||
    - prometheus
 | 
					    - prometheus
 | 
				
			||||||
    - prometheus-alertmanager
 | 
					    - prometheus-alertmanager
 | 
				
			||||||
 | 
					    - motd-role
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Monitor all hosts
 | 
					# Monitor all hosts
 | 
				
			||||||
- hosts: all
 | 
					- hosts: all
 | 
				
			||||||
| 
						 | 
					@ -32,5 +38,11 @@
 | 
				
			||||||
    ldap_user_tree: "cn=Utilisateurs,{{ ldap_base }}"
 | 
					    ldap_user_tree: "cn=Utilisateurs,{{ ldap_base }}"
 | 
				
			||||||
    ldap_grafana_bind_dn: "cn=grafana,ou=service-users,{{ ldap_base }}"
 | 
					    ldap_grafana_bind_dn: "cn=grafana,ou=service-users,{{ ldap_base }}"
 | 
				
			||||||
    ldap_grafana_passwd: "{{ vault_ldap_grafana_passwd }}"
 | 
					    ldap_grafana_passwd: "{{ vault_ldap_grafana_passwd }}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Indicate service in motd
 | 
				
			||||||
 | 
					    motd_role:
 | 
				
			||||||
 | 
					      name: grafana
 | 
				
			||||||
 | 
					      path: /etc/grafana/
 | 
				
			||||||
  roles:
 | 
					  roles:
 | 
				
			||||||
    - grafana
 | 
					    - grafana
 | 
				
			||||||
 | 
					    - motd-role
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4,8 +4,14 @@
 | 
				
			||||||
  vars:
 | 
					  vars:
 | 
				
			||||||
    # Debian mirror on adm
 | 
					    # Debian mirror on adm
 | 
				
			||||||
    debian_mirror: http://mirror.adm.crans.org/debian
 | 
					    debian_mirror: http://mirror.adm.crans.org/debian
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Indicate service in motd
 | 
				
			||||||
 | 
					    motd_role:
 | 
				
			||||||
 | 
					      name: wireguard
 | 
				
			||||||
 | 
					      path: /etc/wireguard/
 | 
				
			||||||
  roles:
 | 
					  roles:
 | 
				
			||||||
    - wireguard
 | 
					    - wireguard
 | 
				
			||||||
 | 
					    - motd-role
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Deploy DNS server
 | 
					# Deploy DNS server
 | 
				
			||||||
- hosts: odlyd.adm.crans.org
 | 
					- hosts: odlyd.adm.crans.org
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -0,0 +1,6 @@
 | 
				
			||||||
 | 
					---
 | 
				
			||||||
 | 
					- name: "Indicate {{ motd_role.name }} in motd"
 | 
				
			||||||
 | 
					  template:
 | 
				
			||||||
 | 
					    src: update-motd.d/05-service.j2
 | 
				
			||||||
 | 
					    dest: "/etc/update-motd.d/05-{{ motd_role.name }}"
 | 
				
			||||||
 | 
					    mode: 0755
 | 
				
			||||||
| 
						 | 
					@ -0,0 +1,6 @@
 | 
				
			||||||
 | 
					#!/bin/sh
 | 
				
			||||||
 | 
					# {{ ansible_managed }}
 | 
				
			||||||
 | 
					echo "✨ {{ motd_role.name|capitalize }} a été déployé sur cette machine."
 | 
				
			||||||
 | 
					{% if motd_role.path is defined %}
 | 
				
			||||||
 | 
					echo "   Voir {{ motd_role.path }}"
 | 
				
			||||||
 | 
					{% endif %}
 | 
				
			||||||
| 
						 | 
					@ -7,5 +7,10 @@
 | 
				
			||||||
- hosts: voyager.adm.crans.org
 | 
					- hosts: voyager.adm.crans.org
 | 
				
			||||||
  vars:
 | 
					  vars:
 | 
				
			||||||
    service_version: 1.1.10
 | 
					    service_version: 1.1.10
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Indicate service in motd
 | 
				
			||||||
 | 
					    motd_role:
 | 
				
			||||||
 | 
					      name: framadate
 | 
				
			||||||
  roles:
 | 
					  roles:
 | 
				
			||||||
    - framadate
 | 
					    - framadate
 | 
				
			||||||
 | 
					    - motd-role
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue