diff --git a/.gitmodules b/.gitmodules index 57d7a45..1d3ecb7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "static/bs"] - path = static/bs + path = lib/bs url = https://github.com/twbs/bootstrap [submodule "static/fa"] - path = static/fa + path = lib/fa url = https://github.com/FortAwesome/Font-Awesome [submodule "static/jq"] - path = static/jq + path = lib/jq url = https://github.com/jquery/jquery diff --git a/static/bs b/lib/bs similarity index 100% rename from static/bs rename to lib/bs diff --git a/static/fa b/lib/fa similarity index 100% rename from static/fa rename to lib/fa diff --git a/static/jq b/lib/jq similarity index 100% rename from static/jq rename to lib/jq diff --git a/misc/nginx.conf b/misc/nginx.conf index 691ff3a..3ff5789 100644 --- a/misc/nginx.conf +++ b/misc/nginx.conf @@ -1,26 +1,26 @@ server { - root /var/www/html; - index index.html index.htm index.nginx-debian.html; - server_name admin360.kumi.host; # managed by Certbot + root /var/www/html; + index index.html index.htm index.nginx-debian.html; + server_name admin360.kumi.host; # managed by Certbot - location /.well-known/ { - try_files $uri $uri/ =404; - } + location /.well-known/ { + try_files $uri $uri/ =404; + } location /static { - alias /opt/vpnmanager/static/static_root/; + alias /opt/vpnmanager/static/static_root/; } location /js/ { - root /opt/vpnmanager/static/; + root /opt/vpnmanager/static/; } location /fa/ { - root /opt/vpnmanager/static/; + root /opt/vpnmanager/lib/; } location /bs/ { - root /opt/vpnmanager/static/; + root /opt/vpnmanager/lib/; } location /css/ { @@ -28,14 +28,14 @@ server { } location /jq/ { - root /opt/vpnmanager/static/; + root /opt/vpnmanager/lib/; } - + location / { - uwsgi_pass 127.0.0.1:9360; - uwsgi_read_timeout 300; - include uwsgi_params; - } + uwsgi_pass 127.0.0.1:9360; + uwsgi_read_timeout 300; + include uwsgi_params; + } listen 136.243.186.63:443 ssl; # managed by Certbot ssl_certificate /etc/letsencrypt/live/admin360.kumi.host/fullchain.pem; # managed by Certbot