aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbnewbold <bnewbold@robocracy.org>2016-04-10 02:13:38 -0400
committerbnewbold <bnewbold@robocracy.org>2016-04-10 02:13:40 -0400
commit43e55852f43cb733eac46965561b0995592ea3e7 (patch)
treefd894c9bd25320703fbfaeb81409df9cbc0d028d
parent5b149a4482ad11db8871368f3b616681536f5872 (diff)
downloadinfra-43e55852f43cb733eac46965561b0995592ea3e7.tar.gz
infra-43e55852f43cb733eac46965561b0995592ea3e7.zip
update vars (missed a commit?)
Somehow some changes got lost to this files; trying my best to receate the patch.
-rw-r--r--playbooks/init_adze.yml12
-rw-r--r--vars/robocracy.yml8
2 files changed, 12 insertions, 8 deletions
diff --git a/playbooks/init_adze.yml b/playbooks/init_adze.yml
index e2c1f79..54cd8ca 100644
--- a/playbooks/init_adze.yml
+++ b/playbooks/init_adze.yml
@@ -5,17 +5,21 @@
gather_facts: True
vars_files:
- vars/vault.yml
- - vars/default.yml
+ - vars/robocracy.yml
vars:
- admin_email: "root@robocracy.org"
- main_user_name: bnewbold
+ - admin_email: "root@robocracy.org"
+ - main_user_name: bnewbold
+ - hostname_fqdn: adze.robocracy.org
roles:
- debian_jessie
+ - hostname
- common
- nullmailer
- # TODO: nginx
+ - nginx
+ - git
+ #- mediagoblin
tasks:
- name: Create main user account
diff --git a/vars/robocracy.yml b/vars/robocracy.yml
index a79cbf8..a8017d8 100644
--- a/vars/robocracy.yml
+++ b/vars/robocracy.yml
@@ -17,8 +17,8 @@ nullmailer_smtp_pass: "{{ vault_nullmailer_smtp_pass }}"
gitolite_admin_pubkey: pubkeys/bnewbold.pub
gitolite_config_keys: ".*"
-nginx_default_404: robocracy_404.html
-nginx_default_50x: robocracy_50x.html
-nginx_default_index: robocracy_index.html
-nginx_default_robots: robocracy_robots.txt
+nginx_default_404: files/robocracy_404.html
+nginx_default_50x: files/robocracy_50x.html
+nginx_default_index: files/robocracy_index.html
+nginx_default_robots: files/robocracy_robots.txt
#nginx_default_favicon: nginx_default_favicon.png