diff --git a/tasks/main.yml b/tasks/main.yml index 90562b4..49c5721 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -19,9 +19,6 @@ - import_tasks: syslog.yml tags: syslog -- import_tasks: webserver.yml - tags: webserver - - import_tasks: systemd.yml tags: systemd diff --git a/tasks/webserver.yml b/tasks/webserver.yml deleted file mode 100644 index 2e4c5c6..0000000 --- a/tasks/webserver.yml +++ /dev/null @@ -1,12 +0,0 @@ -- name: "webserver: Konfiguration kopieren" - template: - src: nginx-site.j2 - dest: "{{ zammad_webserver_configuration }}" - notify: reload nginx - -- name: "webserver: Kofiguration aktivieren" - file: - src: "{{ zammad_webserver_configuration }}" - dest: "/etc/nginx/sites-enabled/{{ zammad_domain }}" - state: link - notify: reload nginx diff --git a/templates/nginx-site.j2 b/templates/nginx-site.j2 deleted file mode 100644 index 77b9b28..0000000 --- a/templates/nginx-site.j2 +++ /dev/null @@ -1,54 +0,0 @@ -### {{ ansible_managed }} - -upstream zammad-railsserver { - server 127.0.0.1:3000; -} - -upstream zammad-websocket { - server 127.0.0.1:6042; -} - -server { - listen 80; - server_name {{ zammad_domain }}; - - root {{ zammad_home }}/public; - error_log /var/log/nginx/{{ zammad_domain }}.error.log; - - client_max_body_size 50M; - - location ~ ^/(assets/|robots.txt|humans.txt|favicon.ico|apple-touch-icon.png) { - expires max; - } - - location /cable { - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header CLIENT_IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_read_timeout 86400; - proxy_pass http://zammad-railsserver; - } - - location /ws { - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header CLIENT_IP $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_read_timeout 86400; - proxy_pass http://zammad-websocket; - } - - location / { - proxy_set_header Host $http_host; - proxy_set_header CLIENT_IP $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; - # Change this line in an SSO setup - proxy_set_header X-Forwarded-User ""; - proxy_read_timeout 300; - proxy_pass http://zammad-railsserver; - } -}