Merge pull request #47 from greenalto/global_config

Set two variable files from site.yml

.gitignore

@@ -0,0 +1 @@
+/vars/user.yml

roles/blog/vars/main.yml

@@ -1 +0,0 @@
-blog_domain: TODO.com

roles/common/vars/main.yml

@@ -1,3 +0,0 @@
-main_user_name: TODO
-admin_email: TODO@TODO.com
-encfs_password: TODO

roles/ircbouncer/vars/main.yml

@@ -1 +0,0 @@
-znc_version: 1.0

roles/mailserver/vars/main.yml

@@ -1,26 +0,0 @@
----
-mail_server_hostname: mail.TODO.com
-mail_mysql_username: mailuser
-mail_mysql_password: TODO
-mail_mysql_database: mailserver
-mail_virtual_domains:
-  - name: TODO
-    pk_id: 1
-    primary_user: TODO
-  - name: TODO
-    pk_id: 2
-    primary_user: TODO
-mail_virtual_users:
-  - address: TODO@TODO.com
-    password_hash: TODO
-    domain_pk_id: 1
-  - address: TODO@TODO.com
-    password_hash: TODO@TODO.com
-    domain_pk_id: 2
-mail_virtual_aliases:
-  - source: root@TODO.com
-    destination: TODO@TODO.com
-    domain_pk_id: 1
-  - source: postmaster@TODO.com
-    destination: TODO@TODO.com
-    domain_pk_id: 1

roles/owncloud/vars/main.yml

@@ -1,4 +0,0 @@
-owncloud_domain: cloud.TODO.com
-owncloud_mysql_username: owncloud
-owncloud_mysql_password: TODO
-owncloud_mysql_database: owncloud

roles/tarsnap/vars/main.yml

@@ -1 +0,0 @@
-tarsnap_version: 1.0.35

roles/vpn/templates/etc_openvpn_easy-rsa_2.0_vars.j2

@@ -60,13 +60,13 @@ export KEY_EXPIRE=3650
 # These are the default values for fields
 # which will be placed in the certificate.
 # Don't leave any of these fields blank.
-export KEY_COUNTRY="{{ key_country }}"
-export KEY_PROVINCE="{{ key_province }}"
-export KEY_CITY="{{ key_city }}"
-export KEY_ORG="{{ key_org }}"
-export KEY_EMAIL="{{ key_email }}"
-export KEY_CN={{ key_cn }}
-export KEY_NAME={{ key_name }}
-export KEY_OU={{ key_ou }}
+export KEY_COUNTRY="{{ openvpn_key_country }}"
+export KEY_PROVINCE="{{ openvpn_key_province }}"
+export KEY_CITY="{{ openvpn_key_city }}"
+export KEY_ORG="{{ openvpn_key_org }}"
+export KEY_EMAIL="{{ openvpn_key_email }}"
+export KEY_CN={{ openvpn_key_cn }}
+export KEY_NAME={{ openvpn_key_name }}
+export KEY_OU={{ openvpn_key_ou }}
 export PKCS11_MODULE_PATH=changeme
 export PKCS11_PIN=1234

roles/vpn/vars/main.yml

@@ -1,8 +0,0 @@
-key_country: TODO
-key_province: TODO
-key_city: TODO
-key_org: TODO
-key_email: TODO
-key_ou: TODO
-key_cn: TODO
-key_name: TODO

roles/webmail/vars/main.yml

@@ -1 +0,0 @@
-webmail_domain: TODO.com

site.yml

@@ -5,6 +5,9 @@
   user: deploy
   sudo: True
   gather_facts: False
+  vars_files:
+    - vars/defaults.yml
+    - vars/user.yml
 
   roles:
     - common

vars/defaults.yml

@@ -0,0 +1,68 @@
+---
+###############################################################################
+# DO NOT EDIT. Set your variables in `vars/user.yml` instead. This is a
+# reference of all the variables.
+###############################################################################
+
+# # blog
+# blog_domain: TODO.com
+
+# # common
+# main_user_name: TODO
+# admin_email: TODO@TODO.com
+# encfs_password: TODO
+
+# ircbouncer
+znc_version: 1.0
+
+# # mailserver
+# mail_server_hostname: mail.TODO.com
+# mail_mysql_username: mailuser
+# mail_mysql_password: TODO
+# mail_mysql_database: mailserver
+# mail_virtual_domains:
+#   - name: TODO
+#     pk_id: 1
+#     primary_user: TODO
+#   - name: TODO
+#     pk_id: 2
+#     primary_user: TODO
+# mail_virtual_users:
+#   - address: TODO@TODO.com
+#     password_hash: TODO
+#     domain_pk_id: 1
+#   - address: TODO@TODO.com
+#     password_hash: TODO@TODO.com
+#     domain_pk_id: 2
+# mail_virtual_aliases:
+#   - source: root@TODO.com
+#     destination: TODO@TODO.com
+#     domain_pk_id: 1
+#   - source: postmaster@TODO.com
+#     destination: TODO@TODO.com
+#     domain_pk_id: 1
+
+# # monitoring
+
+
+# # owncloud
+# owncloud_domain: cloud.TODO.com
+# owncloud_mysql_username: owncloud
+# owncloud_mysql_password: TODO
+# owncloud_mysql_database: owncloud
+
+# tarsnap
+tarsnap_version: 1.0.35
+
+# # vpn
+# openvpn_key_country: TODO
+# openvpn_key_province: TODO
+# openvpn_key_city: TODO
+# openvpn_key_org: TODO
+# openvpn_key_email: TODO
+# openvpn_key_ou: TODO
+# openvpn_key_cn: TODO
+# openvpn_key_name: TODO
+
+# # webmail
+# webmail_domain: TODO.com

vars/user.yml

@@ -0,0 +1,68 @@
+---
+###############################################################################
+# Uncomment and set your variables here. For a complete reference look at the
+# `vars/defaults.yml` file.
+###############################################################################
+#
+# # blog
+# blog_domain: TODO.com
+
+# # common
+# main_user_name: TODO
+# admin_email: TODO@TODO.com
+# encfs_password: TODO
+
+# # ircbouncer
+# znc_version: 1.0
+
+# # mailserver
+# mail_server_hostname: mail.TODO.com
+# mail_mysql_username: mailuser
+# mail_mysql_password: TODO
+# mail_mysql_database: mailserver
+# mail_virtual_domains:
+#   - name: TODO
+#     pk_id: 1
+#     primary_user: TODO
+#   - name: TODO
+#     pk_id: 2
+#     primary_user: TODO
+# mail_virtual_users:
+#   - address: TODO@TODO.com
+#     password_hash: TODO
+#     domain_pk_id: 1
+#   - address: TODO@TODO.com
+#     password_hash: TODO@TODO.com
+#     domain_pk_id: 2
+# mail_virtual_aliases:
+#   - source: root@TODO.com
+#     destination: TODO@TODO.com
+#     domain_pk_id: 1
+#   - source: postmaster@TODO.com
+#     destination: TODO@TODO.com
+#     domain_pk_id: 1
+
+# # monitoring
+
+
+# # owncloud
+# owncloud_domain: cloud.TODO.com
+# owncloud_mysql_username: owncloud
+# owncloud_mysql_password: TODO
+# owncloud_mysql_database: owncloud
+
+# # tarsnap
+# tarsnap_version: 1.0.35
+
+# # vpn
+# openvpn_key_country: TODO
+# openvpn_key_province: TODO
+# openvpn_key_city: TODO
+# openvpn_key_org: TODO
+# openvpn_key_email: TODO
+# openvpn_key_ou: TODO
+# openvpn_key_cn: TODO
+# openvpn_key_name: TODO
+
+# # webmail
+# webmail_domain: TODO.com