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
ce3135da
Commit
ce3135da
authored
Oct 17, 2013
by
John Jarvis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
consolidates and refactor common role
parent
e807e76c
Show whitespace changes
Inline
Side-by-side
Showing
24 changed files
with
83 additions
and
342 deletions
+83
-342
playbooks/group_vars/all
+1
-1
playbooks/roles/common/defaults/main.yml
+7
-0
playbooks/roles/common/tasks/create_venv.yml
+0
-51
playbooks/roles/common/tasks/edx_logging_base.yml
+0
-40
playbooks/roles/common/tasks/main.yml
+25
-52
playbooks/roles/common/tasks/software_update.yml
+0
-6
playbooks/roles/common/templates/edx_logrotate.j2
+1
-1
playbooks/roles/common/templates/edx_logrotate_tracking_log.j2
+1
-1
playbooks/roles/common/templates/edx_rsyslog.j2
+4
-4
playbooks/roles/edxapp/defaults/main.yml
+6
-3
playbooks/roles/edxapp/tasks/cms.yml
+1
-1
playbooks/roles/edxapp/tasks/lms-preview.yml
+1
-1
playbooks/roles/edxapp/tasks/lms.yml
+1
-1
playbooks/roles/edxapp/tasks/main.yml
+25
-38
playbooks/roles/edxapp/tasks/npm.yml
+0
-9
playbooks/roles/edxapp/tasks/ruby.yml
+0
-114
playbooks/roles/edxapp/tasks/upstart.yml
+0
-9
playbooks/roles/nginx/tasks/main.yml
+1
-1
playbooks/roles/nginx/templates/cms.j2
+2
-2
playbooks/roles/nginx/templates/edx_logrotate_nginx_access.j2
+1
-1
playbooks/roles/nginx/templates/edx_logrotate_nginx_error.j2
+1
-1
playbooks/roles/nginx/templates/lms.j2
+2
-2
playbooks/roles/splunkforwarder/defaults/main.yml
+2
-2
playbooks/secure_example/vars/edxapp_ref_vars.yml
+1
-1
No files found.
playbooks/group_vars/all
View file @
ce3135da
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
data_dir: /edx/var
data_dir: /edx/var
app_dir: /edx/app
app_dir: /edx/app
log_
base_
dir: "{{ data_dir }}/log"
log_dir: "{{ data_dir }}/log"
os_name: ubuntu
os_name: ubuntu
ENV_NAME: 'default_env'
ENV_NAME: 'default_env'
...
...
playbooks/roles/common/defaults/main.yml
View file @
ce3135da
...
@@ -8,3 +8,10 @@ common_debian_pkgs:
...
@@ -8,3 +8,10 @@ common_debian_pkgs:
-
tree
-
tree
-
git
-
git
-
unzip
-
unzip
-
python2.7
-
python-pip
-
python2.7-dev
common_pip_pkgs
:
-
virtualenv
-
virtualenvwrapper
playbooks/roles/common/tasks/create_venv.yml
deleted
100644 → 0
View file @
e807e76c
---
# create the 'edx' virtual environment in /opt so that roles can populate it
-
name
:
common | Install python and pip
apt
:
pkg={{item}} install_recommends=yes state=present update_cache=yes
with_items
:
-
python2.7
-
python-pip
-
python2.7-dev
tags
:
-
pre_install
-
install
-
name
:
common | pip install virtualenv
pip
:
>
name=virtualenv
state=present
extra_args="-i {{ PYPI_MIRROR_URL }}"
tags
:
-
venv_base
-
install
-
name
:
common | pip install virtualenvwrapper
pip
:
>
name=virtualenvwrapper
state=present
extra_args="-i {{ PYPI_MIRROR_URL }}"
tags
:
-
venv_base
-
install
-
name
:
common | create edx virtualenv directory
file
:
path={{ venv_dir }} owner=ubuntu group=adm mode=2775 state=directory
tags
:
-
venv_base
-
install
-
name
:
common | create the edx virtualenv directory initial contents
command
:
/usr/local/bin/virtualenv {{ venv_dir }} --distribute creates=$venv_dir/bin/activate
tags
:
-
venv_base
-
install
-
name
:
common | pip install gunicorn
pip
:
>
name=gunicorn
virtualenv="{{venv_dir}}"
state=present
extra_args="-i {{ PYPI_MIRROR_URL }}"
tags
:
-
gunicorn
-
install
playbooks/roles/common/tasks/edx_logging_base.yml
deleted
100644 → 0
View file @
e807e76c
---
#- name: common | Install rsyslog configuration for ansible runs
# template: dest=/etc/rsyslog.d/90-edx.conf src=ansible_rsyslog.j2 owner=root group=root mode=644
# notify: common | restart rsyslogd
# tags:
# - lms-env
# - cms-env
# - logging
# - update
-
name
:
common | Install rsyslog configuration for edX
template
:
dest=/etc/rsyslog.d/99-edx.conf src=edx_rsyslog.j2 owner=root group=root mode=644
notify
:
common | restart rsyslogd
tags
:
-
logging
-
update
-
name
:
common | Install logrotate configuration for edX
template
:
dest=/etc/logrotate.d/edx-services src=edx_logrotate.j2 owner=root group=root mode=644
tags
:
-
logging
-
update
-
name
:
common | Touch tracking file into existence
command
:
touch -a {{log_base_dir}}/tracking.log creates={{log_base_dir}}/tracking.log
tags
:
-
logging
-
update
-
name
:
common | Set permissions on tracking file
file
:
path={{log_base_dir}}/tracking.log owner=syslog group=adm mode=640
tags
:
-
logging
-
update
-
name
:
common | Install logrotate configuration for tracking file
template
:
dest=/etc/logrotate.d/tracking.log src=edx_logrotate_tracking_log.j2 owner=root group=root mode=644
tags
:
-
logging
-
update
playbooks/roles/common/tasks/main.yml
View file @
ce3135da
...
@@ -3,36 +3,17 @@
...
@@ -3,36 +3,17 @@
# This is the default user for nginx
# This is the default user for nginx
user
:
name=www-data
user
:
name=www-data
-
name
:
common | Create
the base directory for storage
-
name
:
common | Create
common directories
file
:
>
file
:
>
path={{ data_dir }}
path={{ data_dir }}
state=directory
state=directory
owner=root
owner=root
group=root
group=root
mode=0755
mode=0755
with_items
:
-
name
:
common | Create the base directory for the app
-
"
{{
data_dir
}}"
file
:
>
-
"
{{
app_dir
}}"
path={{ app_dir }}
-
"
{{
log_dir
}}"
state=directory
owner=root
group=root
mode=0755
-
name
:
common | Create upload directory
file
:
path={{ app_dir }}/uploads mode=2775 state=directory owner=root group=adm
-
name
:
common | Create data dir
file
:
path={{ app_dir }}/data state=directory owner=www-data group=root
tags
:
-
pre_install
-
update
-
name
:
common | Create staticfiles dir
file
:
path={{ app_dir }}/staticfiles state=directory owner=www-data group=adm mode=2775
tags
:
-
pre_install
-
update
-
name
:
common | Install role-independent useful system packages
-
name
:
common | Install role-independent useful system packages
# do this before log dir setup; rsyslog package guarantees syslog user present
# do this before log dir setup; rsyslog package guarantees syslog user present
...
@@ -40,45 +21,37 @@
...
@@ -40,45 +21,37 @@
tags
:
tags
:
-
pre_install
-
pre_install
-
update
-
update
-
name
:
common | Create log directory
file
:
path={{log_base_dir}} state=directory mode=2755 group=adm owner=syslog
tags
:
-
pre_install
-
update
-
update
-
name
:
common | Create alias from app_dir to the log_base_dir
-
name
:
common | upload sudo config for key forwarding as root
file
:
state=link src={{log_base_dir}} path={{app_dir}}/log
copy
:
src=ssh_key_forward dest=/etc/sudoers.d/ssh_key_forward validate='visudo -c -f %s' owner=root group=root mode=0440
-
name
:
common | pip install virtualenv
pip
:
>
name="{{ item }}"
state=present
extra_args="-i {{ PYPI_MIRROR_URL }}"
with_items
:
common_pip_pkgs
-
name
:
common | Install rsyslog configuration for edX
template
:
dest=/etc/rsyslog.d/99-edx.conf src=edx_rsyslog.j2 owner=root group=root mode=644
notify
:
common | restart rsyslogd
tags
:
tags
:
-
pre_install
-
logging
-
logging
-
update
-
update
notify
:
common | restart rsyslogd
-
name
:
common |
Create convenience link from log_base_dir to system logs
-
name
:
common |
Install logrotate configuration for edX
file
:
state=link src=/var/log path=$log_base_dir/system
template
:
dest=/etc/logrotate.d/edx-services src=edx_logrotate.j2 owner=root group=root mode=644
tags
:
tags
:
-
pre_install
-
logging
-
logging
-
update
-
update
notify
:
common | restart logrotate
-
name
:
common | Touch edx log file into place
# This is done for the benefit of the rake commands, which expect it
command
:
touch -a {{log_base_dir}}/edx.log creates={{log_base_dir}}/edx.log
tags
:
-
pre_install
-
logging
-
install
-
name
:
common | Set permissions on edx log file
-
name
:
common | Install logrotate configuration for tracking file
# This is done for the benefit of the rake commands, which expect it
template
:
dest=/etc/logrotate.d/tracking.log src=edx_logrotate_tracking_log.j2 owner=root group=root mode=644
file
:
path={{log_base_dir}}/edx.log owner=syslog group=adm mode=640
tags
:
tags
:
-
pre_install
-
logging
-
logging
-
update
-
update
notify
:
common | restart logrotate
-
name
:
common | upload sudo config for key forwarding as root
copy
:
src=ssh_key_forward dest=/etc/sudoers.d/ssh_key_forward validate='visudo -c -f %s' owner=root group=root mode=0440
-
include
:
create_venv.yml
-
include
:
edx_logging_base.yml
playbooks/roles/common/tasks/software_update.yml
deleted
100644 → 0
View file @
e807e76c
---
-
name
:
common | edx-update.sh, manual lms/cms update script
template
:
src=edx-update.sh.j2 dest=/usr/local/bin/edx-update.sh owner=ubuntu group=adm mode=0775
tags
:
-
release
-
update
playbooks/roles/common/templates/edx_logrotate.j2
View file @
ce3135da
{{log_
base_
dir}}/*/edx.log {
{{log_dir}}/*/edx.log {
create
create
compress
compress
copytruncate
copytruncate
...
...
playbooks/roles/common/templates/edx_logrotate_tracking_log.j2
View file @
ce3135da
{{log_
base_
dir}}/tracking.log {
{{log_dir}}/tracking.log {
create
create
compress
compress
delaycompress
delaycompress
...
...
playbooks/roles/common/templates/edx_rsyslog.j2
View file @
ce3135da
...
@@ -27,12 +27,12 @@ auth,authpriv.* /var/log/auth.log
...
@@ -27,12 +27,12 @@ auth,authpriv.* /var/log/auth.log
$template tracking,"%syslogtag%%msg%\n"
$template tracking,"%syslogtag%%msg%\n"
# looks for [service_name=<name>] in the beginning of the log message,
# looks for [service_name=<name>] in the beginning of the log message,
# if it exists the log will go into {{log_
base_
dir}}/<name>/edx.log, otherwise
# if it exists the log will go into {{log_dir}}/<name>/edx.log, otherwise
# it will go into {{log_
base_
dir}}/edx.log
# it will go into {{log_dir}}/edx.log
$template DynaFile,"{{log_
base_
dir}}/%syslogtag:R,ERE,1,BLANK:\[service_variant=([a-zA-Z_-]*)\].*--end%/edx.log"
$template DynaFile,"{{log_dir}}/%syslogtag:R,ERE,1,BLANK:\[service_variant=([a-zA-Z_-]*)\].*--end%/edx.log"
local0.* -?DynaFile
local0.* -?DynaFile
local1.* {{log_
base_
dir}}/tracking.log;tracking
local1.* {{log_dir}}/tracking.log;tracking
#cron.* /var/log/cron.log
#cron.* /var/log/cron.log
#daemon.* -/var/log/daemon.log
#daemon.* -/var/log/daemon.log
kern.* -/var/log/kern.log
kern.* -/var/log/kern.log
...
...
playbooks/roles/edxapp/defaults/main.yml
View file @
ce3135da
...
@@ -92,8 +92,11 @@ EDXAPP_LMS_PREVIEW_BASIC_AUTH: False
...
@@ -92,8 +92,11 @@ EDXAPP_LMS_PREVIEW_BASIC_AUTH: False
#Use YAML references (& and *) and hash merge <<: to factor out shared settings
#Use YAML references (& and *) and hash merge <<: to factor out shared settings
#see http://atechie.net/2009/07/merging-hashes-in-yaml-conf-files/
#see http://atechie.net/2009/07/merging-hashes-in-yaml-conf-files/
edxapp_data_dir
:
edxapp_data_dir
:
"
{{
data_dir
}}/edxapp"
edxapp_app_dir
:
edxapp_app_dir
:
"
{{
app_dir
}}/edxapp"
edxapp_log_dir
:
"
{{
log_dir
}}/edxapp"
edxapp_user
:
edxapp
edxapp_generic_auth_config
:
&edxapp_generic_auth
edxapp_generic_auth_config
:
&edxapp_generic_auth
AWS_ACCESS_KEY_ID
:
$EDXAPP_AWS_ACCESS_KEY_ID
AWS_ACCESS_KEY_ID
:
$EDXAPP_AWS_ACCESS_KEY_ID
AWS_SECRET_ACCESS_KEY
:
$EDXAPP_AWS_SECRET_ACCESS_KEY
AWS_SECRET_ACCESS_KEY
:
$EDXAPP_AWS_SECRET_ACCESS_KEY
...
@@ -129,7 +132,6 @@ edxapp_generic_auth_config: &edxapp_generic_auth
...
@@ -129,7 +132,6 @@ edxapp_generic_auth_config: &edxapp_generic_auth
OPTIONS
:
*generic_modulestore_default_options
OPTIONS
:
*generic_modulestore_default_options
DATABASES
:
DATABASES
:
default
:
default
:
ENGINE
:
'
django.db.backends.mysql'
NAME
:
$EDXAPP_MYSQL_DB_NAME
NAME
:
$EDXAPP_MYSQL_DB_NAME
USER
:
$EDXAPP_MYSQL_USER
USER
:
$EDXAPP_MYSQL_USER
PASSWORD
:
$EDXAPP_MYSQL_PASSWORD
PASSWORD
:
$EDXAPP_MYSQL_PASSWORD
...
@@ -296,6 +298,7 @@ sandbox_post_requirements: "{{ edx_platform_code_dir }}/requirements/edx-sandbo
...
@@ -296,6 +298,7 @@ sandbox_post_requirements: "{{ edx_platform_code_dir }}/requirements/edx-sandbo
install_sandbox_reqs_into_regular_venv
:
true
install_sandbox_reqs_into_regular_venv
:
true
lms_debian_pkgs
:
lms_debian_pkgs
:
-
npm
# for compiling the virtualenv
# for compiling the virtualenv
# (only needed if wheel files aren't available)
# (only needed if wheel files aren't available)
-
build-essential
-
build-essential
...
...
playbooks/roles/edxapp/tasks/cms.yml
View file @
ce3135da
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
-
deploy
-
deploy
-
name
:
Create CMS log target directory
-
name
:
Create CMS log target directory
file
:
path={{log_
base_
dir}}/cms state=directory owner=syslog group=syslog mode=2750
file
:
path={{log_dir}}/cms state=directory owner=syslog group=syslog mode=2750
tags
:
tags
:
-
cms
-
cms
-
cms-env
-
cms-env
...
...
playbooks/roles/edxapp/tasks/lms-preview.yml
View file @
ce3135da
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
-
deploy
-
deploy
-
name
:
Create lms-preview log target directory
-
name
:
Create lms-preview log target directory
file
:
path={{log_
base_
dir}}/lms-preview state=directory owner=syslog group=syslog mode=2750
file
:
path={{log_dir}}/lms-preview state=directory owner=syslog group=syslog mode=2750
tags
:
tags
:
-
lms-preview
-
lms-preview
-
lms-preview-env
-
lms-preview-env
...
...
playbooks/roles/edxapp/tasks/lms.yml
View file @
ce3135da
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
-
deploy
-
deploy
-
name
:
Create lms log target directory
-
name
:
Create lms log target directory
file
:
path={{log_
base_
dir}}/lms state=directory owner=syslog group=syslog mode=2750
file
:
path={{log_dir}}/lms state=directory owner=syslog group=syslog mode=2750
tags
:
tags
:
-
lms
-
lms
-
lms-env
-
lms-env
...
...
playbooks/roles/edxapp/tasks/main.yml
View file @
ce3135da
...
@@ -2,54 +2,41 @@
...
@@ -2,54 +2,41 @@
# - group_vars/all
# - group_vars/all
# - common/tasks/main.yml
# - common/tasks/main.yml
---
---
-
name
:
Change permissions on datadir
-
name
:
edxapp | create application user
file
:
path={{ app_dir }}/data state=directory owner=www-data group=www-data
user
:
name="{{ edxapp_user }}"
tags
:
-
cms
-
lms
-
lms-env
-
update
-
name
:
Change owner on staticfiles
-
name
:
edxapp | create edxapp app dir
file
:
path={{ app_dir }}/staticfiles state=directory owner=www-data group=adm
file
:
>
tags
:
path="{{ item }}"
-
cms
state=directory
-
lms
owner=root
-
lms-env
group="{{ edxapp_user }}"
-
update
with_items
:
-
"
{{
edxapp_app_dir
}}"
-
"
{{
edxapp_app_dir
}}/venvs"
-
name
:
Create theming directory
-
name
:
edxapp | create edxapp data dirs
file
:
path={{ app_dir }}/themes state=directory mode=2775 group=adm owner=www-data
file
:
>
tags
:
path="{{ item }}"
-
cms
state=directory
-
lms
owner="{{ edxapp_user }}"
-
cms-env
with_items
:
-
lms-env
-
"
{{
edxapp_log_dir
}}"
-
update
-
"
{{
edxapp_data_dir
}}/staticfiles"
-
"
{{
edxapp_data_dir
}}/data"
-
"
{{
edxapp_data_dir
}}/uploads"
-
"
{{
edxapp_data_dir
}}/themes"
-
name
:
install a bunch of
system packages on which LMS and CMS rely
-
name
:
edxapp | install
system packages on which LMS and CMS rely
apt
:
pkg={{','.join(lms_debian_pkgs)}} state=present
apt
:
pkg={{','.join(lms_debian_pkgs)}} state=present
tags
:
-
lms
-
cms
-
install
-
name
:
creating edxapp upstart script
-
name
:
edxapp |
creating edxapp upstart script
sudo
:
True
sudo
:
True
template
:
src=edxapp.conf.j2 dest=/etc/init/edxapp.conf owner=root group=root
template
:
src=edxapp.conf.j2 dest=/etc/init/edxapp.conf owner=root group=root
when
:
"
celery_worker
is
not
defined"
when
:
"
celery_worker
is
not
defined"
tags
:
-
upstart
-
gunicorn
-
update
-
name
:
create edx-workers upstart script
-
name
:
edxapp |
create edx-workers upstart script
template
:
src=edx-workers.conf.j2 dest=/etc/init/edx-workers.conf owner=root group=root
template
:
src=edx-workers.conf.j2 dest=/etc/init/edx-workers.conf owner=root group=root
when
:
"
celery_worker
is
defined"
when
:
"
celery_worker
is
defined"
tags
:
-
upstart
-
update
-
include
:
npm.yml
-
include
:
ruby.yml
-
include
:
deploy.yml
-
include
:
deploy.yml
playbooks/roles/edxapp/tasks/npm.yml
deleted
100644 → 0
View file @
e807e76c
# requires:
# - common/tasks/main.yml
# - ruby/tasks/main.yml
---
-
name
:
Install npm
apt
:
pkg=npm state=present install_recommends=no
tags
:
-
npm
-
install
playbooks/roles/edxapp/tasks/ruby.yml
deleted
100644 → 0
View file @
e807e76c
#
#cribbed from https://github.com/mmoya/ansible-playbooks/blob/master/rbenv/main.yml
-
name
:
Create 'www' user (replicating historical environment)
user
:
name=www state=present
tags
:
-
ruby
-
update
-
name
:
Create ruby base
file
:
path=$ruby_base state=directory owner=www group=www
tags
:
-
ruby
-
update
-
name
:
rbenv | install build depends
apt
:
pkg=$item state=present install_recommends=no
with_items
:
-
build-essential
-
git
-
libcurl4-openssl-dev
-
libmysqlclient-dev
-
libreadline-dev
-
libssl-dev
-
libxml2-dev
-
libxslt1-dev
-
zlib1g-dev
tags
:
-
ruby
-
install
-
name
:
rbenv | update rbenv repo
git
:
repo=https://github.com/sstephenson/rbenv.git dest=$rbenv_root version=v0.4.0
tags
:
-
ruby
-
install
-
name
:
rbenv | add rbenv to path
file
:
path=/usr/local/bin/rbenv src=${rbenv_root}/bin/rbenv state=link
tags
:
-
ruby
-
update
-
name
:
rbenv | add rbenv initialization to profile
template
:
src=rbenv.sh.j2 dest=/etc/profile.d/rbenv.sh owner=root group=root mode=0755
tags
:
-
ruby
-
update
-
name
:
rbenv | check ruby-build installed
command
:
test -x /usr/local/bin/ruby-build
register
:
rbuild_present
ignore_errors
:
yes
tags
:
-
ruby
-
install
-
name
:
rbenv | create temporary directory
command
:
mktemp -d
register
:
tempdir
when
:
rbuild_present|failed
tags
:
-
ruby
-
install
-
name
:
rbenv | clone ruby-build repo
git
:
repo=https://github.com/sstephenson/ruby-build.git dest=${tempdir.stdout}/ruby-build
when
:
rbuild_present|failed
tags
:
-
ruby
-
install
-
name
:
rbenv | install ruby-build
command
:
./install.sh chdir=${tempdir.stdout}/ruby-build
when
:
rbuild_present|failed
tags
:
-
ruby
-
install
-
name
:
rbenv | remove temporary directory
file
:
path=${tempdir.stdout} state=absent
when
:
rbuild_present|failed
tags
:
-
ruby
-
install
-
name
:
rbenv | check ruby $ruby_version installed
shell
:
RBENV_ROOT=${rbenv_root} rbenv versions | grep $ruby_version
register
:
ruby_installed
ignore_errors
:
yes
tags
:
-
ruby
-
install
-
name
:
rbenv | install ruby $ruby_version
shell
:
RBENV_ROOT=${rbenv_root} rbenv install $ruby_version
when
:
ruby_installed|failed
tags
:
-
ruby
-
install
-
name
:
rbenv | set global ruby $ruby_version
shell
:
RBENV_ROOT=${rbenv_root} rbenv global $ruby_version
when
:
ruby_installed|failed
tags
:
-
ruby
-
install
-
name
:
rbenv | rehash
shell
:
RBENV_ROOT=${rbenv_root} rbenv rehash
when
:
ruby_installed|failed
tags
:
-
ruby
-
install
playbooks/roles/edxapp/tasks/upstart.yml
deleted
100644 → 0
View file @
e807e76c
# write the gunicorn upstart script for {{ service_variant }}
-
name
:
writing {{ basename }} upstart script to /etc/init
sudo
:
True
template
:
src={{ basename }}.conf.j2 dest=/etc/init/{{ basename }}.conf owner=root group=root
tags
:
-
upstart
-
gunicorn
-
update
-
deploy
playbooks/roles/nginx/tasks/main.yml
View file @
ce3135da
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
-
update
-
update
-
name
:
nginx | Create nginx log file location (just in case)
-
name
:
nginx | Create nginx log file location (just in case)
file
:
path={{log_
base_
dir}}/nginx state=directory owner=syslog group=syslog mode=2770 recurse=yes
file
:
path={{log_dir}}/nginx state=directory owner=syslog group=syslog mode=2770 recurse=yes
tags
:
tags
:
-
nginx
-
nginx
-
logging
-
logging
...
...
playbooks/roles/nginx/templates/cms.j2
View file @
ce3135da
...
@@ -11,8 +11,8 @@ server {
...
@@ -11,8 +11,8 @@ server {
server_name studio.*;
server_name studio.*;
access_log {{log_
base_
dir}}/nginx/access.log;
access_log {{log_dir}}/nginx/access.log;
error_log {{log_
base_
dir}}/nginx/error.log error;
error_log {{log_dir}}/nginx/error.log error;
# CS184 requires uploads of up to 4MB for submitting screenshots.
# CS184 requires uploads of up to 4MB for submitting screenshots.
# CMS requires larger value for course assest, values provided
# CMS requires larger value for course assest, values provided
...
...
playbooks/roles/nginx/templates/edx_logrotate_nginx_access.j2
View file @
ce3135da
# Put in place by ansible
# Put in place by ansible
{{log_
base_
dir}}/nginx/access.log {
{{log_dir}}/nginx/access.log {
create 0640 www-data adm
create 0640 www-data adm
compress
compress
delaycompress
delaycompress
...
...
playbooks/roles/nginx/templates/edx_logrotate_nginx_error.j2
View file @
ce3135da
# Put in place by ansible
# Put in place by ansible
{{log_
base_
dir}}/nginx/error.log {
{{log_dir}}/nginx/error.log {
create 0640 www-data adm
create 0640 www-data adm
compress
compress
delaycompress
delaycompress
...
...
playbooks/roles/nginx/templates/lms.j2
View file @
ce3135da
...
@@ -9,8 +9,8 @@ server {
...
@@ -9,8 +9,8 @@ server {
listen {{EDXAPP_LMS_NGINX_PORT}} default;
listen {{EDXAPP_LMS_NGINX_PORT}} default;
access_log {{log_
base_
dir}}/nginx/access.log;
access_log {{log_dir}}/nginx/access.log;
error_log {{log_
base_
dir}}/nginx/error.log error;
error_log {{log_dir}}/nginx/error.log error;
# CS184 requires uploads of up to 4MB for submitting screenshots.
# CS184 requires uploads of up to 4MB for submitting screenshots.
# CMS requires larger value for course assest, values provided
# CMS requires larger value for course assest, values provided
...
...
playbooks/roles/splunkforwarder/defaults/main.yml
View file @
ce3135da
...
@@ -23,7 +23,7 @@ SPLUNKFORWARDER_DEB: !!null
...
@@ -23,7 +23,7 @@ SPLUNKFORWARDER_DEB: !!null
SPLUNKFORWARDER_PASSWORD
:
!!null
SPLUNKFORWARDER_PASSWORD
:
!!null
SPLUNKFORWARDER_LOG_ITEMS
:
SPLUNKFORWARDER_LOG_ITEMS
:
-
directory
:
'
{{log_
base_
dir}}'
-
directory
:
'
{{log_dir}}'
recursive
:
true
recursive
:
true
index
:
'
{{ENV_TYPE}}-{{ENV_NAME}}'
index
:
'
{{ENV_TYPE}}-{{ENV_NAME}}'
sourcetype
:
'
edx'
sourcetype
:
'
edx'
...
@@ -31,7 +31,7 @@ SPLUNKFORWARDER_LOG_ITEMS:
...
@@ -31,7 +31,7 @@ SPLUNKFORWARDER_LOG_ITEMS:
recursive
:
true
recursive
:
true
index
:
'
{{ENV_TYPE}}-{{ENV_NAME}}'
index
:
'
{{ENV_TYPE}}-{{ENV_NAME}}'
sourcetype
:
'
syslog'
sourcetype
:
'
syslog'
-
directory
:
'
{{log_
base_
dir}}/nginx'
-
directory
:
'
{{log_dir}}/nginx'
recursive
:
true
recursive
:
true
index
:
'
{{ENV_TYPE}}-{{ENV_NAME}}'
index
:
'
{{ENV_TYPE}}-{{ENV_NAME}}'
sourcetype
:
'
nginx'
sourcetype
:
'
nginx'
...
...
playbooks/secure_example/vars/edxapp_ref_vars.yml
View file @
ce3135da
...
@@ -178,7 +178,7 @@ cms_env_config:
...
@@ -178,7 +178,7 @@ cms_env_config:
'
KEY_PREFIX'
:
'
hidden-prod'
'
KEY_PREFIX'
:
'
hidden-prod'
'
LOCATION'
:
[
'
hidden-prod'
,
'
LOCATION'
:
[
'
hidden-prod'
,
'
hidden-prod'
]
'
hidden-prod'
]
'
LOG_DIR'
:
'
{{log_
base_
dir}}/edx'
'
LOG_DIR'
:
'
{{log_dir}}/edx'
'
LOGGING_ENV'
:
'
cms-dev'
'
LOGGING_ENV'
:
'
cms-dev'
'
SITE_NAME'
:
'
studio.cms-dev.m.edx.org'
'
SITE_NAME'
:
'
studio.cms-dev.m.edx.org'
'
SYSLOG_SERVER'
:
'
syslog.a.m.i4x.org'
'
SYSLOG_SERVER'
:
'
syslog.a.m.i4x.org'
...
...
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