From 2dacc8d999cf7e590747ac66e92e94f8ab49457d Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@edx.org>
Date: Wed, 12 Jun 2013 17:17:18 -0400
Subject: [PATCH] Move the nginx config variable from common.
Put the configuration information in the vars for the nginx role
since that is the only role that uses it.
---
playbooks/roles/common/vars/main.yml | 18 ------------------
playbooks/roles/nginx/vars/main.yml | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 18 deletions(-)
delete mode 100644 playbooks/roles/common/vars/main.yml
diff --git a/playbooks/roles/common/vars/main.yml b/playbooks/roles/common/vars/main.yml
deleted file mode 100644
index 16b2dc4..0000000
--- a/playbooks/roles/common/vars/main.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Variables for the common role
-# Automatically loaded when the common role is used
----
-nginx_cfg:
- # - link - turn on
- # - absent - turn off
- sites_enabled:
- basic_auth: link
- edx_release: link
- # path to version files for the basic
- # nginx configuration
- version_html: $app_base_dir/versions.html
- version_json: $app_base_dir/versions.json
- # default htpasswd contents set to edx/edx
- # this value can be overiden in vars/secure/<group>.yml
- htpasswd: |
- edx:$apr1$2gWcIvlc$Nu7b/KTwd5HoIDEkSPNUk/
-
diff --git a/playbooks/roles/nginx/vars/main.yml b/playbooks/roles/nginx/vars/main.yml
index 1f93d51..c519633 100644
--- a/playbooks/roles/nginx/vars/main.yml
+++ b/playbooks/roles/nginx/vars/main.yml
@@ -3,3 +3,19 @@
pkgs:
nginx:
state: installed
+
+
+nginx_cfg:
+ # - link - turn on
+ # - absent - turn off
+ sites_enabled:
+ basic_auth: link
+ edx_release: link
+ # path to version files for the basic
+ # nginx configuration
+ version_html: $app_base_dir/versions.html
+ version_json: $app_base_dir/versions.json
+ # default htpasswd contents set to edx/edx
+ # this value can be overiden in vars/secure/<group>.yml
+ htpasswd: |
+ edx:$apr1$2gWcIvlc$Nu7b/KTwd5HoIDEkSPNUk/
--
libgit2 0.26.0