Use common domain variable instead of blog_domain

roles/blog/tasks/blog.yml

@@ -1,11 +1,11 @@
 - name: Create directory for blog HTML
-  file: state=directory path=/var/www/${blog_domain} group=www-data owner=www-data
+  file: state=directory path=/var/www/${domain} group=www-data owner=www-data
 
 - name: Configure the Apache HTTP server for the blog
-  template: src=etc_apache2_sites-available_blog.j2 dest=/etc/apache2/sites-available/${blog_domain} group=www-data owner=www-data
+  template: src=etc_apache2_sites-available_blog.j2 dest=/etc/apache2/sites-available/${domain} group=www-data owner=www-data
   notify: restart apache
 
 - name: Enable blog site
-  command: a2ensite ${blog_domain} creates=/etc/apache2/sites-enabled/${blog_domain}
+  command: a2ensite ${domain} creates=/etc/apache2/sites-enabled/${domain}
   notify: restart apache
 

roles/blog/templates/etc_apache2_sites-available_blog.j2

@@ -1,14 +1,14 @@
 <VirtualHost *:80>
-    ServerName {{ blog_domain }}
-    ServerAlias www.{{ blog_domain }}
+    ServerName {{ domain }}
+    ServerAlias www.{{ domain }}
 
-    Redirect / https://{{ blog_domain }}/
+    Redirect / https://{{ domain }}/
 </VirtualHost>
 
 
 <VirtualHost *:443>
-    ServerName {{ blog_domain }}
-    ServerAlias www.{{ blog_domain }}
+    ServerName {{ domain }}
+    ServerAlias www.{{ domain }}
 
     SSLEngine on
     SSLProtocol ALL -SSLv2
@@ -19,7 +19,7 @@
     SSLCertificateKeyFile   /etc/ssl/private/wildcard_private.key
     SSLCACertificateFile    /etc/ssl/certs/wildcard_ca.pem
 
-    DocumentRoot            "/var/www/{{ blog_domain }}"
+    DocumentRoot            "/var/www/{{ domain }}"
     DirectoryIndex          index.html
     Options                 -Indexes
 

roles/mailserver/files/etc_dovecot_conf.d_20-imap.conf

@@ -60,5 +60,5 @@ protocol imap {
 protocol lmtp {
   # Space separated list of plugins to load (default is global mail_plugins).
   mail_plugins = $mail_plugins sieve
-  postmaster_address = postmaster@TODO.com
+  postmaster_address = postmaster@{{domain}}
 }

roles/mailserver/templates/etc_dovecot_conf.d_15-lda.conf.j2

@@ -4,7 +4,7 @@
 
 # Address to use when sending rejection mails.
 # Default is postmaster@<your domain>.
-postmaster_address = postmaster@TODO.com
+postmaster_address = postmaster@{{domain}}
 
 # Hostname to use in various parts of sent mails, eg. in Message-Id.
 # Default is the system's real hostname.

vars/defaults.yml

@@ -4,10 +4,8 @@
 # reference of all the variables.
 ###############################################################################
 
-# # blog
-# blog_domain: TODO.com
-
 # # common
+# domain: TODO.com
 # main_user_name: TODO
 # admin_email: TODO@TODO.com
 # encfs_password: TODO

vars/user.yml

@@ -3,11 +3,9 @@
 # Uncomment and set your variables here. For a complete reference look at the
 # `vars/defaults.yml` file.
 ###############################################################################
-#
-# # blog
-# blog_domain: TODO.com
 
 # # common
+# domain: TODO.com
 # main_user_name: TODO
 # admin_email: TODO@TODO.com
 # encfs_password: TODO