Import ansible-role-nginx
We use nginx as our HTTP proxy for Jenkins. We also update the default nginx.conf files to remove the default sites that have been enabled on both CentOS and Ubuntu. Change-Id: I9a88f82a399fa33c4d970c2835c43995cf63931b Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
443e65da19
commit
a3429b3364
|
@ -0,0 +1,17 @@
|
|||
# This file is generated by Ansible
|
||||
# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
|
||||
#
|
||||
server {
|
||||
listen 80;
|
||||
|
||||
location / {
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
|
||||
# Fix the "It appears that your reverse proxy set up is broken" error.
|
||||
proxy_pass http://127.0.0.1:8008;
|
||||
proxy_read_timeout 90;
|
||||
}
|
||||
}
|
|
@ -0,0 +1,76 @@
|
|||
# This file is generated by Ansible
|
||||
# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
|
||||
#
|
||||
user www-data;
|
||||
worker_processes 4;
|
||||
pid /run/nginx.pid;
|
||||
|
||||
events {
|
||||
worker_connections 768;
|
||||
# multi_accept on;
|
||||
}
|
||||
|
||||
http {
|
||||
|
||||
##
|
||||
# Basic Settings
|
||||
##
|
||||
|
||||
sendfile on;
|
||||
tcp_nopush on;
|
||||
tcp_nodelay on;
|
||||
keepalive_timeout 65;
|
||||
types_hash_max_size 2048;
|
||||
# server_tokens off;
|
||||
|
||||
# server_names_hash_bucket_size 64;
|
||||
# server_name_in_redirect off;
|
||||
|
||||
include /etc/nginx/mime.types;
|
||||
default_type application/octet-stream;
|
||||
|
||||
##
|
||||
# Logging Settings
|
||||
##
|
||||
|
||||
access_log /var/log/nginx/access.log;
|
||||
error_log /var/log/nginx/error.log;
|
||||
|
||||
##
|
||||
# Gzip Settings
|
||||
##
|
||||
|
||||
gzip on;
|
||||
gzip_disable "msie6";
|
||||
|
||||
# gzip_vary on;
|
||||
# gzip_proxied any;
|
||||
# gzip_comp_level 6;
|
||||
# gzip_buffers 16 8k;
|
||||
# gzip_http_version 1.1;
|
||||
# gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
|
||||
|
||||
##
|
||||
# nginx-naxsi config
|
||||
##
|
||||
# Uncomment it if you installed nginx-naxsi
|
||||
##
|
||||
|
||||
#include /etc/nginx/naxsi_core.rules;
|
||||
|
||||
##
|
||||
# nginx-passenger config
|
||||
##
|
||||
# Uncomment it if you installed nginx-passenger
|
||||
##
|
||||
|
||||
#passenger_root /usr;
|
||||
#passenger_ruby /usr/bin/ruby;
|
||||
|
||||
##
|
||||
# Virtual Host Configs
|
||||
##
|
||||
|
||||
include /etc/nginx/conf.d/*.conf;
|
||||
# include /etc/nginx/sites-enabled/*;
|
||||
}
|
|
@ -0,0 +1,33 @@
|
|||
# This file is generated by Ansible
|
||||
# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
|
||||
#
|
||||
user nginx;
|
||||
worker_processes auto;
|
||||
error_log /var/log/nginx/error.log;
|
||||
pid /run/nginx.pid;
|
||||
|
||||
events {
|
||||
worker_connections 1024;
|
||||
}
|
||||
|
||||
http {
|
||||
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
|
||||
'$status $body_bytes_sent "$http_referer" '
|
||||
'"$http_user_agent" "$http_x_forwarded_for"';
|
||||
|
||||
access_log /var/log/nginx/access.log main;
|
||||
|
||||
sendfile on;
|
||||
tcp_nopush on;
|
||||
tcp_nodelay on;
|
||||
keepalive_timeout 65;
|
||||
types_hash_max_size 2048;
|
||||
|
||||
include /etc/nginx/mime.types;
|
||||
default_type application/octet-stream;
|
||||
|
||||
# Load modular configuration files from the /etc/nginx/conf.d directory.
|
||||
# See http://nginx.org/en/docs/ngx_core_module.html#include
|
||||
# for more information.
|
||||
include /etc/nginx/conf.d/*.conf;
|
||||
}
|
|
@ -18,3 +18,7 @@ jenkins_plugins_manager:
|
|||
version: 0.1.3
|
||||
- name: zmq-event-publisher
|
||||
version: 0.0.3
|
||||
|
||||
# windmill.nginx
|
||||
nginx_file_include_dir_src: jenkins/etc/nginx/conf.d/
|
||||
nginx_file_nginx_conf_src: "jenkins/etc/nginx/nginx.conf.{{ ansible_os_family }}"
|
||||
|
|
|
@ -59,6 +59,7 @@
|
|||
- windmill.jenkins
|
||||
- windmill.jenkins-job-builder
|
||||
- windmill.jenkins-plugins
|
||||
- windmill.nginx
|
||||
|
||||
vars_files:
|
||||
- vars/jenkins.yaml
|
||||
|
|
|
@ -31,5 +31,6 @@ zuul-cloner -m $CLONEMAP \
|
|||
openstack/ansible-role-jenkins \
|
||||
openstack/ansible-role-jenkins-job-builder \
|
||||
openstack/ansible-role-jenkins-plugins \
|
||||
openstack/ansible-role-nginx \
|
||||
openstack/ansible-role-nodepool \
|
||||
openstack/ansible-role-zuul
|
||||
|
|
Loading…
Reference in New Issue