diff --git a/roles/gitea/defaults/main.yml b/roles/gitea/defaults/main.yml index 3a78921..a88111f 100644 --- a/roles/gitea/defaults/main.yml +++ b/roles/gitea/defaults/main.yml @@ -1,11 +1,11 @@ --- # Version to install -gitea_version: 1.11.7 +gitea_version: 1.12.0 # URL to the binary gitea_bin_url: https://dl.gitea.io/gitea/{{ gitea_version }}/gitea-{{ gitea_version }}-linux-amd64 # sha256 of the binary -gitea_bin_sha256: 9261c23b0063132eba61f995561d3a1e76eabfadd7370f8dea2989180c36e2ff +gitea_bin_sha256: 4077f35a87d4cb08e88fcc69fe8645ff9559928276886b7da33080dd24c36d1e # Handle updates. If set to false, ansible will only install # Gitea and then won't touch an existing installation gitea_manage_upgrade: True diff --git a/roles/nginx/templates/nginx.conf.j2 b/roles/nginx/templates/nginx.conf.j2 index c187cf2..a844718 100644 --- a/roles/nginx/templates/nginx.conf.j2 +++ b/roles/nginx/templates/nginx.conf.j2 @@ -31,6 +31,17 @@ http { '$server_name $http_x_forwarded_for - $lmremote_user [$time_local] "$request" ' '$status $body_bytes_sent "$http_referer" ' '"$http_user_agent" scheme="$scheme"'; +{% else %} + # LL::NG not installed, just make those log formats aliases of the non llng formats + log_format combined_virtual_llng + '$server_name $remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" scheme="$scheme"'; + + log_format combined_virtual_backend_llng + '$server_name $http_x_forwarded_for - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" scheme="$scheme"'; {% endif %} access_log /var/log/nginx/access.log {{ nginx_log_format }};