x
/
snap-keystone
Code Issues Proposed changes

Drop copyfiles for nginx 

Drop copyfiles from snap-openstack.yaml for nginx, and modify the nginx
template files such that we can install them in $SNAP_COMMON while pointing
them at additional default config files in $SNAP.

Change-Id: I82c71c0ca25385eccbffee38a80a31a5b6275608
This commit is contained in:
Corey Bryant 2017-05-24 18:11:13 -04:00
parent c30e9203b2
commit f3614a9776
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
snap/snap-openstack.yaml
View File

@ -17,8 +17,6 @@ setup:
keystone-nginx.conf.j2: "{snap_common}/etc/nginx/sites-enabled/keystone.conf"
keystone-snap.conf.j2: "{snap_common}/etc/keystone/conf.d/keystone-snap.conf"
nginx.conf.j2: "{snap_common}/etc/nginx/nginx.conf"
copyfiles:
"{snap}/usr/conf": "{snap_common}/etc/nginx"
rchown:
"{snap_common}/fernet-keys": "snap-keystone:snap-keystone"
"{snap_common}/lib": "snap-keystone:snap-keystone"

4
snap/templates/keystone-nginx.conf.j2
View File

@ -3,7 +3,7 @@ server {
access_log {{ snap_common }}/log/nginx-access.log;
error_log {{ snap_common }}/log/nginx-error.log;
location / {
include uwsgi_params;
include {{ snap }}/usr/conf/uwsgi_params;
uwsgi_param SCRIPT_NAME '';
uwsgi_pass unix://{{ snap_common }}/run/admin.sock;
}
@ -13,7 +13,7 @@ server {
access_log {{ snap_common }}/log/nginx-access.log;
error_log {{ snap_common }}/log/nginx-error.log;
location / {
include uwsgi_params;
include {{ snap }}/usr/conf/uwsgi_params;
uwsgi_param SCRIPT_NAME '';
uwsgi_pass unix://{{ snap_common }}/run/public.sock;
}

2
snap/templates/nginx.conf.j2
View File

@ -17,7 +17,7 @@ http {
keepalive_timeout 65;
types_hash_max_size 2048;
include {{ snap_common }}/etc/nginx/mime.types;
include {{ snap }}/usr/conf/mime.types;
default_type application/octet-stream;
##