diff --git a/inventory/group_vars/gitea_servers.yml b/inventory/group_vars/gitea_servers.yml index 6231997..642e7b3 100644 --- a/inventory/group_vars/gitea_servers.yml +++ b/inventory/group_vars/gitea_servers.yml @@ -23,38 +23,9 @@ apache_mods_enabled_gitea: - rewrite - headers apache_vhosts_gitea: - - servername: git.metaunix.net + - servername: git.metaunix.net git.int.metaunix.net gitea.int.metaunix.net {{ ansible_fqdn }} documentroot: /var/www/html extra_parameters: | ProxyPreserveHost On ProxyPass / http://127.0.0.1:3000/ ProxyPassReverse / http://127.0.0.1:3000/ - -# Nginx reverse proxy config -nginx_worker_processes: "{{ ansible_processor_vcpus|default(ansible_processor_count) }}" -nginx_worker_connections: '1024' -nginx_multi_accept: 'off' -nginx_remove_default_vhost: True -nginx_vhosts: - - listen: '80 default_server' - server_name: 'gitea.int.metaunix.net git.metaunix.net' - extra_parameters: | - # Proxy settings for Gitea - location / { - proxy_pass http://127.0.0.1:3000; - 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; - proxy_read_timeout 30; - } - - # Optional: serve /assets directly if needed - location /assets/ { - proxy_pass http://127.0.0.1:3000/assets/; - 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; - proxy_read_timeout 30; - } diff --git a/inventory/group_vars/munin_masters.yml b/inventory/group_vars/munin_masters.yml index 62bf089..de270e2 100644 --- a/inventory/group_vars/munin_masters.yml +++ b/inventory/group_vars/munin_masters.yml @@ -8,7 +8,7 @@ apache_mods_enabled_munin: - rewrite - headers apache_vhosts_munin: - - servername: munin.metaunix.net + - servername: munin.int.metaunix.net {{ ansible_fqdn }} documentroot: /var/cache/munin/www extra_parameters: | ScriptAlias /munin-cgi/ /usr/lib/munin/cgi/