From f4b276c88896c832886a7b6eef84a6f174198597 Mon Sep 17 00:00:00 2001
From: Giancarlo Razzolini <grazzolini@archlinux.org>
Date: Thu, 29 Dec 2016 22:22:09 -0200
Subject: [PATCH] playbooks: Add the archweb role to apollo and change the
orion role to use the new default variables, with a global db host variable
---
playbooks/apollo.yml | 1 +
playbooks/orion.yml | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/playbooks/apollo.yml b/playbooks/apollo.yml
index 928e6ebfb..5842b8851 100644
--- a/playbooks/apollo.yml
+++ b/playbooks/apollo.yml
@@ -19,4 +19,5 @@
- { role: postgres, postgres_max_connections: 1000, postgres_shared_buffers: 4096MB, tags: ['postgres'] }
- { role: sudo, tags: ['sudo'] }
- { role: uwsgi, tags: ['uwsgi'] }
+ - { role: archweb, tags: ["archweb"] }
- { role: security_tracker, security_tracker_domain: "security.archlinux.org", security_tracker_dir: "/srv/http/security-tracker", tags: ["security_tracker"] }
diff --git a/playbooks/orion.yml b/playbooks/orion.yml
index f3f52251e..97b5f8223 100644
--- a/playbooks/orion.yml
+++ b/playbooks/orion.yml
@@ -3,6 +3,8 @@
- name: setup orion
hosts: orion
remote_user: root
+ vars:
+ archweb_db_host: 'apollo.archlinux.org'
roles:
- { role: common, tags: ['common'] }
- { role: tools, tags: ['tools'] }
@@ -15,5 +17,5 @@
- { role: nginx, letsencrypt_validation_dir: "/var/lib/letsencrypt", tags: ["nginx"] }
- { role: dbscripts, repos_domain: "repos.archlinux.org", svntogit_repos: "/srv/svntogit/repos", tags: ['dbscripts', 'archusers'] }
- { role: sudo, tags: ['sudo', 'archusers'] }
- - { role: archweb, archweb_home: "/srv/http/archweb", tags: ['archweb'] }
+ - { role: archweb, archweb_site: false, archweb_services: true, archweb_mirrorcheck_locations: [5, 6], tags: ['archweb'] }
- { role: sources, sources_domain: "sources.archlinux.org", sources_dir: "/srv/sources", tags: ['sources'] }
--
GitLab