diff --git a/client/pages/home.js b/client/pages/home.js
index dc28ac10..da8cff40 100644
--- a/client/pages/home.js
+++ b/client/pages/home.js
@@ -29,9 +29,9 @@ module.exports = function (app) {
setTimeout(function(){
fotorama.load([
- {img: 'http://static.shburg.org/art/img/cat1.jpg'},
- {img: 'http://static.shburg.org/art/img/cat2.jpg'},
- {img: 'http://static.shburg.org/art/img/cat3.jpg'}
+ {img: 'https://static.shburg.org/art/img/cat1.jpg'},
+ {img: 'https://static.shburg.org/art/img/cat2.jpg'},
+ {img: 'https://static.shburg.org/art/img/cat3.jpg'}
]);
}, 100);
});
diff --git a/models/documents.json b/models/documents.json
index e858dd32..8d719404 100644
--- a/models/documents.json
+++ b/models/documents.json
@@ -2,47 +2,47 @@
{
"name": "statue-2013",
"title": "устав школы за 2013 год",
- "url": "http://static.shburg.org/art/docs/hudozhka_statue-2013.pdf",
- "preview": "http://static.shburg.org/art/graphics/statue-2013-preview.png",
- "files": ["http://static.shburg.org/art/docs/hudozhka_statue-2013.pdf"]
+ "url": "https://static.shburg.org/art/docs/hudozhka_statue-2013.pdf",
+ "preview": "https://static.shburg.org/art/graphics/statue-2013-preview.png",
+ "files": ["https://static.shburg.org/art/docs/hudozhka_statue-2013.pdf"]
},
{
"name": "edu-license",
"title": "образовательная лицензия",
"url": "/document/edu-license",
- "preview": "http://static.shburg.org/art/graphics/license_edu-preview.png",
+ "preview": "https://static.shburg.org/art/graphics/license_edu-preview.png",
"files": [
- "http://static.shburg.org/art/docs/hudozhka_license_edu.jpg",
- "http://static.shburg.org/art/docs/hudozhka_license_edu_back.jpg",
- "http://static.shburg.org/art/docs/hudozhka_license_edu_attachment.jpg"
+ "https://static.shburg.org/art/docs/hudozhka_license_edu.jpg",
+ "https://static.shburg.org/art/docs/hudozhka_license_edu_back.jpg",
+ "https://static.shburg.org/art/docs/hudozhka_license_edu_attachment.jpg"
]
},
{
"name": "gov-certificate",
"title": "свидетельство о государственной регистрации права",
"url": "/document/gov-certificate",
- "preview": "http://static.shburg.org/art/graphics/certificate_gov-preview.png",
- "files": ["http://static.shburg.org/art/docs/hudozhka_certificate_gov.jpg"]
+ "preview": "https://static.shburg.org/art/graphics/certificate_gov-preview.png",
+ "files": ["https://static.shburg.org/art/docs/hudozhka_certificate_gov.jpg"]
},
{
"name": "VAT",
"title": "ИНН",
"url": "/document/VAT",
- "preview": "http://static.shburg.org/art/graphics/vatin-preview.png",
- "files": ["http://static.shburg.org/art/docs/hudozhka_vatin.jpg"]
+ "preview": "https://static.shburg.org/art/graphics/vatin-preview.png",
+ "files": ["https://static.shburg.org/art/docs/hudozhka_vatin.jpg"]
},
{
"name": "EGRYL1",
"title": "свидетельство о внесении в «ЕГРЮЛ»",
"url": "/document/EGRYL1",
- "preview": "http://static.shburg.org/art/graphics/certificate_egryl1-preview.png",
- "files": ["http://static.shburg.org/art/docs/hudozhka_certificate_egryl1.jpg"]
+ "preview": "https://static.shburg.org/art/graphics/certificate_egryl1-preview.png",
+ "files": ["https://static.shburg.org/art/docs/hudozhka_certificate_egryl1.jpg"]
},
{
"name": "EGRYL2",
"title": "свидетельство о внесении в «ЕГРЮЛ»",
"url": "/document/EGRYL2",
- "preview": "http://static.shburg.org/art/graphics/certificate_egryl2-preview.png",
- "files": ["http://static.shburg.org/art/docs/hudozhka_certificate_egryl2.jpg"]
+ "preview": "https://static.shburg.org/art/graphics/certificate_egryl2-preview.png",
+ "files": ["https://static.shburg.org/art/docs/hudozhka_certificate_egryl2.jpg"]
}
]
\ No newline at end of file
diff --git a/models/team.json b/models/team.json
index 62dcd5d2..f09e5b05 100644
--- a/models/team.json
+++ b/models/team.json
@@ -6,7 +6,7 @@
"edu": "Ленинградский инженерно-строительный институт",
"diploma": "НВ №222567",
"status": "",
- "picture": "http://static.shburg.org/art/team/teacher5.jpg",
+ "picture": "https://static.shburg.org/art/team/teacher5.jpg",
"anchor": "director"
},
{
@@ -16,7 +16,7 @@
"edu": "Академия художеств имени И. Е. Репина",
"diploma": "B-I №259798",
"status": "Первая квалификационная категория по живописи и станковой композиции",
- "picture": "http://static.shburg.org/art/team/teacher10.jpg"
+ "picture": "https://static.shburg.org/art/team/teacher10.jpg"
},
{
"id": "od-gogoleva",
@@ -25,7 +25,7 @@
"edu": "Ленинградский инженерно-строительный институт",
"diploma": "B-I №222572",
"status": "Высшая квалификационная категория по живописи и станковой композиции",
- "picture": "http://static.shburg.org/art/team/teacher11.jpg"
+ "picture": "https://static.shburg.org/art/team/teacher11.jpg"
},
{
"id": "nv-andreeva",
@@ -34,7 +34,7 @@
"edu": "Санкт-Петербургский государственный университет технологии и дизайна",
"diploma": "ИВС 0514253",
"status": "Вторая квалификационная категория по прикладной композиции",
- "picture": "http://static.shburg.org/art/team/teacher2.jpg"
+ "picture": "https://static.shburg.org/art/team/teacher2.jpg"
},
{
"id": "vv-voronova",
@@ -43,7 +43,7 @@
"edu": "Российский государственный университет имени А. И. Герцена",
"diploma": "ВСГ 0530340",
"status": "Вторая квалификационная категория по прикладной композиции",
- "picture": "http://static.shburg.org/art/team/teacher1.jpg"
+ "picture": "https://static.shburg.org/art/team/teacher1.jpg"
},
{
"id": "in-vturina",
@@ -52,7 +52,7 @@
"edu": "Кировский государственный педагогический институт имени В. И. Ленина",
"diploma": "ШВ №164501",
"status": "Первая квалификационная категория по скульптуре",
- "picture": "http://static.shburg.org/art/team/teacher8.jpg"
+ "picture": "https://static.shburg.org/art/team/teacher8.jpg"
},
{
"id": "my-valkova",
@@ -61,7 +61,7 @@
"edu": "Педагогический институт имени А. И. Герцена",
"diploma": "ПП №224197",
"status": "Высшая квалификационная категория по истории искусства",
- "picture": "http://static.shburg.org/art/team/teacher12.jpg"
+ "picture": "https://static.shburg.org/art/team/teacher12.jpg"
},
{
"id": "rk-timashev",
@@ -70,7 +70,7 @@
"edu": "Санкт-Петербургский государственный архитектурно-строительный университет",
"diploma": "ВСГ 5344910",
"status": "",
- "picture": "http://static.shburg.org/art/team/teacher4.jpg"
+ "picture": "https://static.shburg.org/art/team/teacher4.jpg"
},
{
"id": "as-timasheva",
@@ -79,7 +79,7 @@
"edu": "Московский архитектурный институт",
"diploma": "РН 70241",
"status": "",
- "picture": "http://static.shburg.org/art/team/teacher3.jpg",
+ "picture": "https://static.shburg.org/art/team/teacher3.jpg",
"contacts": {
"instagram": "annm101"
}
@@ -91,7 +91,7 @@
"edu": "Незаконченный Ленинградский государственный педагогический университет имени А. С. Пушкина",
"diploma": "",
"status": "",
- "picture": "http://static.shburg.org/art/team/teacher9.jpg"
+ "picture": "https://static.shburg.org/art/team/teacher9.jpg"
},
{
"id": "ey-tarasova",
@@ -100,7 +100,7 @@
"edu": "Санкт-Петербургский государственный архитектурно-строительный университет",
"diploma": "ВСВ 1321444",
"status": "",
- "picture": "http://static.shburg.org/art/team/teacher.jpg"
+ "picture": "https://static.shburg.org/art/team/teacher.jpg"
},
{
"id": "ea-burovtseva",
diff --git a/nginx.conf b/nginx.conf
index 5a93e44d..659046dc 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,9 +1,16 @@
server {
- listen 80;
+ listen 443 ssl;
charset utf-8;
-
+
server_name art.shlisselburg.org;
+ ssl_certificate /etc/letsencrypt/live/art.shlisselburg.org/fullchain.pem;
+ ssl_certificate_key /etc/letsencrypt/live/art.shlisselburg.org/privkey.pem;
+
+ ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+ ssl_prefer_server_ciphers on;
+ ssl_ciphers AES256+EECDH:AES256+EDH:!aNULL;
+
location / {
proxy_pass http://hudozka;
proxy_http_version 1.1;
@@ -18,10 +25,24 @@ server {
access_log /var/log/nginx/art.shburg.access.log;
}
+server {
+ listen 443 ssl;
+ server_name art.shburg.org;
+
+ ssl_certificate /etc/letsencrypt/live/art.shlisselburg.org/fullchain.pem;
+ ssl_certificate_key /etc/letsencrypt/live/art.shlisselburg.org/privkey.pem;
+
+ ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+ ssl_prefer_server_ciphers on;
+ ssl_ciphers AES256+EECDH:AES256+EDH:!aNULL;
+
+ return 301 https://art.shlisselburg.org$request_uri;
+}
+
server {
listen 80;
- server_name art.shburg.org;
- return 301 $scheme://art.shlisselburg.org$request_uri;
+ server_name art.shlisselburg.org art.shburg.org;
+ return 301 https://art.shlisselburg.org$request_uri;
}
map $http_upgrade $connection_upgrade {
diff --git a/templates/main.html b/templates/main.html
index 7b96b1a4..1f7ec22f 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -15,8 +15,8 @@
-
-
+
+