Compile nginx from source
Compile nginx from source and cleanup nginx.conf template. Change-Id: Ia42574c3e54ca5bb1c51738367522e658d84f040
This commit is contained in:
parent
dd8b5372c4
commit
e1ddca5d4e
|
@ -9,21 +9,17 @@ setup:
|
||||||
- "{snap_common}/lock"
|
- "{snap_common}/lock"
|
||||||
- "{snap_common}/log"
|
- "{snap_common}/log"
|
||||||
- "{snap_common}/run"
|
- "{snap_common}/run"
|
||||||
# NOTE(coreycb): Drop /var/*/nginx dirs once nginx is compiled from source.
|
|
||||||
# nginx hardcodes paths at compile time without override capability.
|
|
||||||
- "/var/lib/nginx"
|
|
||||||
- "/var/log/nginx"
|
|
||||||
templates:
|
templates:
|
||||||
keystone-snap.conf.j2: "{snap_common}/etc/keystone/conf.d/keystone-snap.conf"
|
keystone-snap.conf.j2: "{snap_common}/etc/keystone/conf.d/keystone-snap.conf"
|
||||||
admin.ini.j2: "{snap_common}/etc/uwsgi/admin.ini"
|
admin.ini.j2: "{snap_common}/etc/uwsgi/admin.ini"
|
||||||
public.ini.j2: "{snap_common}/etc/uwsgi/public.ini"
|
public.ini.j2: "{snap_common}/etc/uwsgi/public.ini"
|
||||||
keystone-nginx.conf.j2: "{snap_common}/etc/nginx/sites-enabled/keystone.conf"
|
keystone-nginx.conf.j2: "{snap_common}/etc/nginx/sites-enabled/keystone.conf"
|
||||||
# NOTE(coreycb): drop nginx.conf template when support lands for
|
# NOTE(coreycb): drop root from nginx.conf template when support lands for
|
||||||
# dropping permissions to regular user.
|
# dropping permissions to regular user.
|
||||||
nginx.conf.j2: "{snap_common}/etc/nginx/nginx.conf"
|
nginx.conf.j2: "{snap_common}/etc/nginx/nginx.conf"
|
||||||
copyfiles:
|
copyfiles:
|
||||||
"{snap}/etc/keystone": "{snap_common}/etc/keystone"
|
"{snap}/etc/keystone": "{snap_common}/etc/keystone"
|
||||||
"{snap}/etc/nginx": "{snap_common}/etc/nginx"
|
"{snap}/usr/conf": "{snap_common}/etc/nginx"
|
||||||
entry_points:
|
entry_points:
|
||||||
keystone-manage:
|
keystone-manage:
|
||||||
binary: "{snap}/bin/keystone-manage"
|
binary: "{snap}/bin/keystone-manage"
|
||||||
|
|
|
@ -1,14 +1,12 @@
|
||||||
user root;
|
user root;
|
||||||
worker_processes auto;
|
worker_processes auto;
|
||||||
pid {{ snap_common }}/run/nginx.pid;
|
pid {{ snap_common }}/run/nginx.pid;
|
||||||
include {{ snap_common }}/etc/nginx/modules-enabled/*.conf;
|
|
||||||
|
|
||||||
events {
|
events {
|
||||||
worker_connections 768;
|
worker_connections 768;
|
||||||
}
|
}
|
||||||
|
|
||||||
http {
|
http {
|
||||||
|
|
||||||
##
|
##
|
||||||
# Basic Settings
|
# Basic Settings
|
||||||
##
|
##
|
||||||
|
@ -22,13 +20,6 @@ http {
|
||||||
include {{ snap_common }}/etc/nginx/mime.types;
|
include {{ snap_common }}/etc/nginx/mime.types;
|
||||||
default_type application/octet-stream;
|
default_type application/octet-stream;
|
||||||
|
|
||||||
##
|
|
||||||
# SSL Settings
|
|
||||||
##
|
|
||||||
|
|
||||||
ssl_protocols TLSv1.1 TLSv1.2;
|
|
||||||
ssl_prefer_server_ciphers on;
|
|
||||||
|
|
||||||
##
|
##
|
||||||
# Logging Settings
|
# Logging Settings
|
||||||
##
|
##
|
||||||
|
|
|
@ -45,7 +45,6 @@ parts:
|
||||||
- libmysqlclient-dev
|
- libmysqlclient-dev
|
||||||
- libssl-dev
|
- libssl-dev
|
||||||
- libsqlite3-dev
|
- libsqlite3-dev
|
||||||
stage-packages: [nginx]
|
|
||||||
stage:
|
stage:
|
||||||
- -usr/bin/2to3
|
- -usr/bin/2to3
|
||||||
- -usr/bin/pydoc
|
- -usr/bin/pydoc
|
||||||
|
@ -75,6 +74,18 @@ parts:
|
||||||
- etc/keystone/*.templates
|
- etc/keystone/*.templates
|
||||||
stage: [$etc]
|
stage: [$etc]
|
||||||
snap: [$etc]
|
snap: [$etc]
|
||||||
|
nginx:
|
||||||
|
source: http://www.nginx.org/download/nginx-1.13.0.tar.gz
|
||||||
|
plugin: autotools
|
||||||
|
configflags:
|
||||||
|
- --prefix=/usr
|
||||||
|
- --http-log-path=/var/snap/keystone/common/log/nginx-access.log
|
||||||
|
- --error-log-path=/var/snap/keystone/common/log/nginx-error.log
|
||||||
|
- --lock-path=/var/snap/keystone/common/lock/nginx.lock
|
||||||
|
- --pid-path=/var/snap/keystone/common/run/nginx.pid
|
||||||
|
build-packages:
|
||||||
|
- libpcre3-dev
|
||||||
|
- libssl-dev
|
||||||
python:
|
python:
|
||||||
source: https://www.python.org/ftp/python/2.7.13/Python-2.7.13.tar.xz
|
source: https://www.python.org/ftp/python/2.7.13/Python-2.7.13.tar.xz
|
||||||
plugin: autotools
|
plugin: autotools
|
||||||
|
|
Loading…
Reference in New Issue