Merge branch 'crans_scripts' into 'newinfra'
[crans_scripts] PEPCRANSIFICATION See merge request nounous/ansible!195certbot_on_virtu
						commit
						d7b9069494
					
				| 
						 | 
					@ -0,0 +1,4 @@
 | 
				
			||||||
 | 
					---
 | 
				
			||||||
 | 
					glob_crans_scripts:
 | 
				
			||||||
 | 
					  remote: http://gitlab.adm.crans.org/nounous/scripts.git
 | 
				
			||||||
 | 
					  version: master
 | 
				
			||||||
| 
						 | 
					@ -34,12 +34,13 @@
 | 
				
			||||||
    # crans_scripts_git: "http://gitlab.adm.crans.org/nounous/scripts.git"
 | 
					    # crans_scripts_git: "http://gitlab.adm.crans.org/nounous/scripts.git"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ntp_client: '{{ glob_ntp_client | combine(loc_ntp_client | default({})) }}'
 | 
					    ntp_client: '{{ glob_ntp_client | combine(loc_ntp_client | default({})) }}'
 | 
				
			||||||
 | 
					    crans_scripts: '{{ glob_crans_scripts | combine(loc_crans_scripts | default({})) }}'
 | 
				
			||||||
  roles:
 | 
					  roles:
 | 
				
			||||||
    - debian-apt-sources
 | 
					    - debian-apt-sources
 | 
				
			||||||
    - common-tools
 | 
					    - common-tools
 | 
				
			||||||
    - sudo
 | 
					    - sudo
 | 
				
			||||||
    - ntp-client
 | 
					    - ntp-client
 | 
				
			||||||
    # - crans-scripts
 | 
					    - crans-scripts
 | 
				
			||||||
    - root-config
 | 
					    - root-config
 | 
				
			||||||
 | 
					
 | 
				
			||||||
- hosts: crans_vm
 | 
					- hosts: crans_vm
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -20,9 +20,9 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
- name: Clone scripts repository
 | 
					- name: Clone scripts repository
 | 
				
			||||||
  git:
 | 
					  git:
 | 
				
			||||||
    repo: "{{ crans_scripts_git }}"
 | 
					    repo: "{{ crans_scripts.remote }}"
 | 
				
			||||||
    dest: /usr/scripts
 | 
					    dest: /usr/scripts
 | 
				
			||||||
    version: master
 | 
					    version: "{{ crans_scripts.version }}"
 | 
				
			||||||
    umask: "002"
 | 
					    umask: "002"
 | 
				
			||||||
  environment:
 | 
					  environment:
 | 
				
			||||||
    GIT_SSL_NO_VERIFY: 1
 | 
					    GIT_SSL_NO_VERIFY: 1
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue