Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
configuration
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
configuration
Commits
de1808c4
Commit
de1808c4
authored
9 years ago
by
Bilal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleaning up my mistake
parent
370cdf62
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
playbooks/roles/nginx/defaults/main.yml
+1
-1
playbooks/roles/nginx/tasks/main.yml
+1
-1
util/jenkins/ansible-provision.sh
+1
-2
No files found.
playbooks/roles/nginx/defaults/main.yml
View file @
de1808c4
...
@@ -11,7 +11,7 @@ NGINX_EDXAPP_EXTRA_CONFIGS: []
...
@@ -11,7 +11,7 @@ NGINX_EDXAPP_EXTRA_CONFIGS: []
NGINX_EDXAPP_CUSTOM_REDIRECTS
:
{}
NGINX_EDXAPP_CUSTOM_REDIRECTS
:
{}
# Override these vars for adding user to nginx.htpasswd
# Override these vars for adding user to nginx.htpasswd
NGINXUSERS
:
NGINX
_
USERS
:
-
name
:
"
{{
COMMON_HTPASSWD_USER
}}"
-
name
:
"
{{
COMMON_HTPASSWD_USER
}}"
password
:
"
{{
COMMON_HTPASSWD_PASS
}}"
password
:
"
{{
COMMON_HTPASSWD_PASS
}}"
state
:
present
state
:
present
...
...
This diff is collapsed.
Click to expand it.
playbooks/roles/nginx/tasks/main.yml
View file @
de1808c4
...
@@ -231,7 +231,7 @@
...
@@ -231,7 +231,7 @@
tags
:
tags
:
-
install
-
install
-
install:configuration
-
install:configuration
with_items
:
NGINXUSERS
with_items
:
NGINX
_
USERS
-
name
:
Create nginx log file location (just in case)
-
name
:
Create nginx log file location (just in case)
file
:
>
file
:
>
...
...
This diff is collapsed.
Click to expand it.
util/jenkins/ansible-provision.sh
View file @
de1808c4
...
@@ -219,6 +219,7 @@ if [[ $basic_auth == "true" ]]; then
...
@@ -219,6 +219,7 @@ if [[ $basic_auth == "true" ]]; then
COMMON_ENABLE_BASIC_AUTH: True
COMMON_ENABLE_BASIC_AUTH: True
COMMON_HTPASSWD_USER:
$auth_user
COMMON_HTPASSWD_USER:
$auth_user
COMMON_HTPASSWD_PASS:
$auth_pass
COMMON_HTPASSWD_PASS:
$auth_pass
NGINX_USERS:
$nginx_users
XQUEUE_BASIC_AUTH_USER:
$auth_user
XQUEUE_BASIC_AUTH_USER:
$auth_user
XQUEUE_BASIC_AUTH_PASSWORD:
$auth_pass
XQUEUE_BASIC_AUTH_PASSWORD:
$auth_pass
EOF_AUTH
EOF_AUTH
...
@@ -268,8 +269,6 @@ SANDBOX_USERNAME: $github_username
...
@@ -268,8 +269,6 @@ SANDBOX_USERNAME: $github_username
EDXAPP_ECOMMERCE_PUBLIC_URL_ROOT: "https://ecommerce-
${
deploy_host
}
"
EDXAPP_ECOMMERCE_PUBLIC_URL_ROOT: "https://ecommerce-
${
deploy_host
}
"
EDXAPP_ECOMMERCE_API_URL: "https://ecommerce-
${
deploy_host
}
/api/v2"
EDXAPP_ECOMMERCE_API_URL: "https://ecommerce-
${
deploy_host
}
/api/v2"
NGINXUSERS:
$nginx_users
ECOMMERCE_ECOMMERCE_URL_ROOT: "https://ecommerce-
${
deploy_host
}
"
ECOMMERCE_ECOMMERCE_URL_ROOT: "https://ecommerce-
${
deploy_host
}
"
ECOMMERCE_LMS_URL_ROOT: "https://
${
deploy_host
}
"
ECOMMERCE_LMS_URL_ROOT: "https://
${
deploy_host
}
"
ECOMMERCE_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true
ECOMMERCE_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment