diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..6313b56c --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto eol=lf diff --git a/assets b/assets index ec4444f0..b0ce9acb 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit ec4444f0acd5b919e025382935229db3ec2cb2e7 +Subproject commit b0ce9acb945ec646d869913f41e8d5b2c3c48744 diff --git a/etc-docker/nginx.conf b/etc-docker/nginx.conf index adcfd194..36b3c862 100644 --- a/etc-docker/nginx.conf +++ b/etc-docker/nginx.conf @@ -36,7 +36,8 @@ http { add_header Cache-Control public; root /home/lacuna/server/var/www/public; # For debugging: - # add_header X-URI $uri; + add_header X-URI $uri always; + add_header X-Served-By 'TLE-Static-Handler' always; try_files $uri $uri/index.html /homepage$uri @@ -44,12 +45,6 @@ http { @backend; } - location ~ \.(html|xml|txt|json) { - add_header Cache-Control must-revalidate; - add_header Cache-Control public; - root /home/lacuna/server/var/www/public; - } - location = /api { rewrite ^ /api/ permanent; } @@ -89,14 +84,16 @@ http { location ~ /v2/.* { proxy_pass http://lacuna-v2-api:5999; proxy_set_header X-Forwarded-Host $remote_addr; + # For debugging: + add_header X-Served-By 'TLE-V2-Proxy' always; } location @backend { proxy_pass http://lacuna-server:5000; proxy_set_header X-Real-IP $remote_addr; # For debugging: - # add_header X-Served-By 'Lacuna' always; - # add_header X-URI $uri always; + add_header X-Served-By 'TLE-V1-Proxy' always; + add_header X-URI $uri always; } } } diff --git a/homepage b/homepage index fe2207f2..f21ed227 160000 --- a/homepage +++ b/homepage @@ -1 +1 @@ -Subproject commit fe2207f2b6bd14909438cfbd50d1b081d2861298 +Subproject commit f21ed227e7e7a748bf0abb11119dfce9779b14f6