Merge pull request 'Добавил favicon #42' (#47) from favicon into master

Reviewed-on: http://pulsdel.ru/MIROCOD/CrossPosting/pulls/47
2023-01-29 11:43:33 +00:00 · 2023-01-29 11:43:33 +00:00 · a70327d64c
commit a70327d64c
parent 517c427023 f3e74ff5c2
5 changed files with 9 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -6,4 +6,5 @@ __pycache__/
 identifier.sqlite
 vk_config.v2.json
 crossposting_backend/private/settings.py
-logs/
+logs/
+static/
--- a/cms/static/cms/icons/favicon.ico
+++ b/cms/static/cms/icons/favicon.ico
--- a/cms/templates/base.html
+++ b/cms/templates/base.html
@ -7,6 +7,8 @@
    {% bootstrap_css %}
    {% bootstrap_javascript %}
    {% bootstrap_messages %}
+    {% load static %}
+    <link rel="icon" href="{% static 'cms/icons/favicon.ico' %}">
    <script type="text/javascript" src="https://vk.com/js/api/share.js?93" charset="windows-1251"></script>
 </head>
 <body>
--- a/conf/nginx/crossposting.conf
+++ b/conf/nginx/crossposting.conf
@ -8,4 +8,8 @@ server {
        location / {
                proxy_pass http://localhost:8888;
        }
+        location /static/ {
+            alias /var/www/crossposting/backend/current/static/;
+            expires max;
+        }
 }
--- a/crossposting_backend/settings.py
+++ b/crossposting_backend/settings.py
@ -147,6 +147,7 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/4.1/howto/static-files/

 STATIC_URL = 'static/'
+STATIC_ROOT = path.join(BASE_DIR, 'static')

 # Default primary key field type
 # https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field