Remove fastcgi and related configuration
In I62321a7b62dabca469eb072ddbf4e8f250ce0fb3, git daemon was added to support hosting git repos from the repo server over the git protocol. When the integrated build transitions to using it, fastcgi and all related configuration can be removed. Depends-On: I09bc504490d4b5114895f7f646fc8254748a7f41 Change-Id: I7ec8277d3883d1f8891de6ae2b0881fe026a34c8
This commit is contained in:
parent
1aa63aa7f4
commit
c87a8c1d4c
@ -37,12 +37,6 @@
|
|||||||
enabled: yes
|
enabled: yes
|
||||||
pattern: "apt-cacher-ng"
|
pattern: "apt-cacher-ng"
|
||||||
|
|
||||||
- name: reload fcgiwrap
|
|
||||||
service:
|
|
||||||
name: "fcgiwrap"
|
|
||||||
state: restarted
|
|
||||||
pattern: "fcgiwrap"
|
|
||||||
|
|
||||||
- name: reload ssh
|
- name: reload ssh
|
||||||
service:
|
service:
|
||||||
name: "ssh"
|
name: "ssh"
|
||||||
|
@ -87,22 +87,6 @@
|
|||||||
- pkg-repo-nginx
|
- pkg-repo-nginx
|
||||||
- pkg-repo-config
|
- pkg-repo-config
|
||||||
|
|
||||||
- name: Change fcgiwrap GID/UID - Debian
|
|
||||||
lineinfile:
|
|
||||||
dest: "/etc/init.d/fcgiwrap"
|
|
||||||
regexp: "{{ item.regexp }}"
|
|
||||||
line: "{{ item.line }}"
|
|
||||||
with_items:
|
|
||||||
- { regexp: "^FCGI_SOCKET_OWNER=", line: 'FCGI_SOCKET_OWNER="{{ repo_service_user_name }}"' }
|
|
||||||
- { regexp: "^FCGI_SOCKET_GROUP=", line: 'FCGI_SOCKET_GROUP="{{ repo_service_group_name }}"' }
|
|
||||||
notify:
|
|
||||||
- reload nginx
|
|
||||||
- reload fcgiwrap
|
|
||||||
when: ansible_os_family == "Debian"
|
|
||||||
tags:
|
|
||||||
- pkg-repo-nginx
|
|
||||||
- pkg-repo-config
|
|
||||||
|
|
||||||
- name: Enable openstack-slushee site
|
- name: Enable openstack-slushee site
|
||||||
file:
|
file:
|
||||||
src: "/etc/nginx/sites-available/openstack-slushee.vhost"
|
src: "/etc/nginx/sites-available/openstack-slushee.vhost"
|
||||||
|
@ -24,13 +24,6 @@ http {
|
|||||||
proxy_read_timeout 600s;
|
proxy_read_timeout 600s;
|
||||||
proxy_send_timeout 600s;
|
proxy_send_timeout 600s;
|
||||||
proxy_connect_timeout 600s;
|
proxy_connect_timeout 600s;
|
||||||
fastcgi_send_timeout 600s;
|
|
||||||
fastcgi_read_timeout 600s;
|
|
||||||
|
|
||||||
fastcgi_cache_path /var/run/nginx-cache levels=1:2 keys_zone=OSGITREPO:100m inactive=60m;
|
|
||||||
fastcgi_cache_key "$scheme$request_method$host$request_uri";
|
|
||||||
fastcgi_cache_use_stale error timeout invalid_header http_500;
|
|
||||||
fastcgi_ignore_headers Cache-Control Expires Set-Cookie;
|
|
||||||
|
|
||||||
# Added Larger Post Max
|
# Added Larger Post Max
|
||||||
client_max_body_size 5M;
|
client_max_body_size 5M;
|
||||||
@ -72,9 +65,6 @@ http {
|
|||||||
|
|
||||||
gzip_http_version 1.0;
|
gzip_http_version 1.0;
|
||||||
|
|
||||||
# Path to NGINX Cache
|
|
||||||
fastcgi_cache_path /var/cache/nginx/ levels=1:2 keys_zone=NGINX_CACHE:10m max_size=32m inactive=5m;
|
|
||||||
|
|
||||||
# Custom Header
|
# Custom Header
|
||||||
add_header X-WHOAMI "OpenStack Private Slushee Repository {{ inventory_hostname }}";
|
add_header X-WHOAMI "OpenStack Private Slushee Repository {{ inventory_hostname }}";
|
||||||
|
|
||||||
|
@ -11,15 +11,4 @@ server {
|
|||||||
autoindex on;
|
autoindex on;
|
||||||
expires 5h;
|
expires 5h;
|
||||||
}
|
}
|
||||||
|
|
||||||
location ~ /openstackgit(/.*) {
|
|
||||||
gzip off;
|
|
||||||
fastcgi_param SCRIPT_FILENAME /usr/lib/git-core/git-http-backend;
|
|
||||||
fastcgi_param SCRIPT_NAME git-http-backend;
|
|
||||||
fastcgi_param GIT_HTTP_EXPORT_ALL "";
|
|
||||||
fastcgi_param GIT_PROJECT_ROOT {{ repo_service_home_folder }}/repo/openstackgit;
|
|
||||||
fastcgi_param PATH_INFO $1;
|
|
||||||
include /etc/nginx/fastcgi_params;
|
|
||||||
fastcgi_pass unix:/var/run/fcgiwrap.socket;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -19,7 +19,6 @@ git_daemon_path: /usr/lib/git-core/git-daemon
|
|||||||
rsyncd_service_name: rsync
|
rsyncd_service_name: rsync
|
||||||
|
|
||||||
repo_server_packages:
|
repo_server_packages:
|
||||||
- fcgiwrap
|
|
||||||
- git
|
- git
|
||||||
- lsyncd
|
- lsyncd
|
||||||
- nginx-extras
|
- nginx-extras
|
||||||
|
Loading…
Reference in New Issue
Block a user