Преглед на файлове

Move defaults from group_vars/$role to reoles/$role/defaults/main.yml

Emmanuel Bouthenot преди 10 години
родител
ревизия
2b11cc1131
променени са 5 файла, в които са добавени 36 реда и са изтрити 41 реда
  1. 0 41
      group_vars/all
  2. 34 0
      roles/common/defaults/main.yml
  3. 0 0
      roles/dbserver/defaults/main.yml
  4. 0 0
      roles/monitoring/defaults/main.yml
  5. 2 0
      roles/webserver/defaults/main.yml

+ 0 - 41
group_vars/all

@@ -1,41 +0,0 @@
-#
-# Default variables
-#
-
-ansible_prolog: True
-
-ansible_master_user: $PIPE(whoami)
-ansible_master_hostname: $PIPE(hostname --fqdn)
-ansible_master_ip: $PIPE(hostname --ip)
-
-admins:
-  - user: manu
-    fullname: Emmanuel Bouthenot
-
-admin_email: kolter@openics.org
-
-hosts_deny_nfs: False
-host_deny_paranoid: False
-
-with_auto_upgrade: True
-with_logcheck: True
-with_rkhunter: True
-with_chkrootkit: True
-
-with_smartd: False
-
-with_postfix: False
-with_mail_aliases: False
-
-with_ssh: True
-ssh_port: 2222
-ssh_ecdsa_key: True
-ssh_usedns: True
-
-http_auth_admin_password: seVDetGvSs7nA # openssl passwd -crypt adm123in
-
-with_ovh: False
-
-sysfs_disk_settings: False
-
-# vim: ft=yaml

+ 34 - 0
roles/common/defaults/main.yml

@@ -0,0 +1,34 @@
+#
+# Default variables
+#
+
+ansible_master_user: admin
+ansible_master_hostname: localhost
+ansible_master_ip: $PIPE(hostname --ip)
+
+admins:
+admin_email: root@localhost
+
+hosts_deny_nfs: False
+host_deny_paranoid: False
+
+with_auto_upgrade: False
+with_logcheck: False
+with_rkhunter: False
+with_chkrootkit: False
+
+with_smartd: False
+
+with_postfix: False
+with_mail_aliases: False
+
+with_ssh: False
+ssh_port: 22
+ssh_ecdsa_key: True
+ssh_usedns: True
+
+with_ovh: False
+
+sysfs_disk_settings: False
+
+# vim: ft=yaml

+ 0 - 0
group_vars/dbserver → roles/dbserver/defaults/main.yml


+ 0 - 0
group_vars/monitoring → roles/monitoring/defaults/main.yml


+ 2 - 0
group_vars/webserver → roles/webserver/defaults/main.yml

@@ -45,4 +45,6 @@ with_php_apc: False
 with_phpmyadmin: False
 phpmyadmin_vhostname: pma.localhost
 
+http_auth_admin_password: seVDetGvSs7nA # openssl passwd -crypt adm123in
+
 # vim: ft=yaml