diff --git a/roles/taiga/files/nginx.conf b/roles/taiga/files/nginx.conf deleted file mode 100644 index 5ada1a0e3a..0000000000 --- a/roles/taiga/files/nginx.conf +++ /dev/null @@ -1,72 +0,0 @@ -# For more information on configuration, see: -# * Official English Documentation: http://nginx.org/en/docs/ -# * Official Russian Documentation: http://nginx.org/ru/docs/ - -user nginx; -worker_processes 1; - -error_log /var/log/nginx/error.log; -#error_log /var/log/nginx/error.log notice; -#error_log /var/log/nginx/error.log info; - -pid /run/nginx.pid; - - -events { - worker_connections 1024; -} - - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - 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; - - #keepalive_timeout 0; - keepalive_timeout 65; - - #gzip on; - - index index.html index.htm; - - # 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; - - #server { - # listen 80 default_server; - # server_name localhost; - # root /usr/share/nginx/html; - - # #charset koi8-r; - - # #access_log /var/log/nginx/host.access.log main; - - # # Load configuration files for the default server block. - # include /etc/nginx/default.d/*.conf; - - # location / { - # } - - # # redirect server error pages to the static page /40x.html - # # - # error_page 404 /404.html; - # location = /40x.html { - # } - - # # redirect server error pages to the static page /50x.html - # # - # error_page 500 502 503 504 /50x.html; - # location = /50x.html { - # } - #} -} diff --git a/roles/taiga/tasks/main.yml b/roles/taiga/tasks/main.yml index 5a5e6b0f19..c2b6658fae 100644 --- a/roles/taiga/tasks/main.yml +++ b/roles/taiga/tasks/main.yml @@ -166,8 +166,6 @@ mode=0644 owner=taiga group=taiga tags: taiga -- - # Link our plugin pieces in place - file: src=/home/taiga/taiga-contrib-fas-openid-auth/front/dist/fas_openid_auth.js dest=/home/taiga/taiga-front-dist/dist/js/fas_openid_auth.js @@ -184,14 +182,11 @@ ### DONE with taiga-front ### FINALLY, nginx to serve/proxy it all + - copy: src=taiga.nginx dest=/etc/nginx/conf.d/taiga.conf mode=0644 owner=nginx group=nginx notify: restart nginx tags: taiga -- copy: src=nginx.conf dest=/etc/nginx/nginx.conf - mode=0644 owner=nginx group=nginx - notify: restart nginx - tags: taiga # Add nginx to the taiga group so it gets rights to read all our static stuff - user: name=nginx groups=taiga append=yes