Commit 7fc8504b authored by Simonas's avatar Simonas

Merge branch 'release-1.7.0'

parents 7555a329 b152b509
...@@ -2,7 +2,7 @@ PROJECT=biuro-www ...@@ -2,7 +2,7 @@ PROJECT=biuro-www
IMAGE_NGINX=fholzer/nginx-brotli IMAGE_NGINX=fholzer/nginx-brotli
IMAGE_MYSQL=mariadb:10.3 IMAGE_MYSQL=mariadb:10.3
IMAGE_WORDPRESS=biuro/web:1.6.13 IMAGE_WORDPRESS=biuro/web:1.7.0
IMAGE_WORDPRESS_CLI=wordpress:cli-php7.3 IMAGE_WORDPRESS_CLI=wordpress:cli-php7.3
DB_NAME=www_biuro DB_NAME=www_biuro
......
E0gkjK_63mbzkN2URysbPu8RTgUExoEiFquObh-x4gY.y6adxkFNK67ZPAdfV3shSdNB9Z13qH2CtgqVtCj-k78
\ No newline at end of file
Fw6s9N0-PfYxn6iAt4ovyl2JOgTsEkkUfbWCcDz-ewM.y6adxkFNK67ZPAdfV3shSdNB9Z13qH2CtgqVtCj-k78
\ No newline at end of file
Pw6-zCOBTY0J9Sl_LvIK7FnrNNhU62odLFzA7P2vhrQ.y6adxkFNK67ZPAdfV3shSdNB9Z13qH2CtgqVtCj-k78
\ No newline at end of file
Z-lLDWBo-iH5G4db7YjgPMwvPtauAdv9r00s2MniNW4.y6adxkFNK67ZPAdfV3shSdNB9Z13qH2CtgqVtCj-k78
\ No newline at end of file
h_yqmAzGBVMkcW28hUGOB5EYnYcoKnkK_TI-egrPE5o.y6adxkFNK67ZPAdfV3shSdNB9Z13qH2CtgqVtCj-k78
\ No newline at end of file
sWiynhipnwryOASPDgJHBxiuMAdKFx3_LwPExeoAl_U.y6adxkFNK67ZPAdfV3shSdNB9Z13qH2CtgqVtCj-k78
\ No newline at end of file
-----BEGIN CERTIFICATE-----
MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
-----END CERTIFICATE-----
\ No newline at end of file
-----BEGIN CERTIFICATE-----
MIIFhDCCBGygAwIBAgISAzMUttLulpeBCMVGjUy5qs05MA0GCSqGSIb3DQEBCwUA
MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xOTA3MjQwNjU4NDJaFw0x
OTEwMjIwNjU4NDJaMBMxETAPBgNVBAMTCGJpdXJvLmx0MIIBIjANBgkqhkiG9w0B
AQEFAAOCAQ8AMIIBCgKCAQEAr0baqXh3G+VVgPe/wwgLri3WzO+R2zpeg6pzHrxa
x7v9wuYnLavE8msyjtg7eMAZsePdg+/Nt/KyHqLZLGl+X2d04ZG+Q5SA9ihdZkbT
7LQnNG8uxfEG1F1i7lNSGmcAcrb1BMXNbJ5CJ5SYFfI2HPcTGgQJ7nn3t7QJ5UEd
WEht9+uv150ZVeU3zlgFDySEfI3nnyoJZjLulihBFwWhL92mQT+QW7tWoZANAKvE
o/TqIcEqwDhYQlbUVrVnGqmi+Nq0wPgjVj+HiDy5VXNCCSTtqaoR7dwqnDG+1d8w
qxistc0kYpGfRdc55/wyFLIL+hxvSBQg+I0heCyj+nmjzQIDAQABo4ICmTCCApUw
DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAM
BgNVHRMBAf8EAjAAMB0GA1UdDgQWBBReKBrlkqo4UUp3YF5HI/doFJ67SjAfBgNV
HSMEGDAWgBSoSmpjBH3duubRObemRWXv86jsoTBvBggrBgEFBQcBAQRjMGEwLgYI
KwYBBQUHMAGGImh0dHA6Ly9vY3NwLmludC14My5sZXRzZW5jcnlwdC5vcmcwLwYI
KwYBBQUHMAKGI2h0dHA6Ly9jZXJ0LmludC14My5sZXRzZW5jcnlwdC5vcmcvMFEG
A1UdEQRKMEiCCGJpdXJvLmVlgghiaXVyby5sdIIIYml1cm8ubHaCDHd3dy5iaXVy
by5lZYIMd3d3LmJpdXJvLmx0ggx3d3cuYml1cm8ubHYwTAYDVR0gBEUwQzAIBgZn
gQwBAgEwNwYLKwYBBAGC3xMBAQEwKDAmBggrBgEFBQcCARYaaHR0cDovL2Nwcy5s
ZXRzZW5jcnlwdC5vcmcwggECBgorBgEEAdZ5AgQCBIHzBIHwAO4AdQDiaUuuJujp
QAnohhu2O4PUPuf+dIj7pI8okwGd3fHb/gAAAWwi/VKIAAAEAwBGMEQCIALeyFzO
ITHL8dZIC04+PnKojACZgpLuWme6w2YhFUurAiAXDRLHY+JFqcG4O3+HktE/6f9C
Tg8Cp34m2M+SFCMMvAB1ACk8UZZUyDlluqpQ/FgH1Ldvv1h6KXLcpMMM9OVFR/R4
AAABbCL9UnkAAAQDAEYwRAIgbZZMtstT4JYXfYgsklR9AyKfe3xxipqvfG+CwB9w
ox4CIGMpILxso8rntlP2BeOlgf7QSIsbPUUmoDMjmWWuPc8FMA0GCSqGSIb3DQEB
CwUAA4IBAQCUOX1+qDdrI38kFc5OVLfrNcb6gU0VeK0B04hpdf4hsTvnCWkThSQi
xx7OX8Dr6C4buOB0AP5OR4/K7d9WqZ+vhLkNDEqeBND6Zuvx808/hZpyt6UuSijX
m34KnMmr2Nf/wUE55WGWLt/r+SjoAbNFF6+zs8Lx9Wnu6floXdnUinKkJJZX+CN/
S5OFWKRQcsCM5IuwVMIAXw1Kt9vm2bQbvYTbFFJWl/kcAqcP5/d+lmbAWM28uS9S
C+uwlVdSVH4U8vB/uMqVf70eToUwmCWJySFlPBWKi5y4zQBkERf9ve+U+tW0H4QB
2JLZ3Py2o3KvKNmDcvs1K3FuMM9y34nd
-----END CERTIFICATE-----
\ No newline at end of file
-----BEGIN CERTIFICATE-----
MIIFhDCCBGygAwIBAgISAzMUttLulpeBCMVGjUy5qs05MA0GCSqGSIb3DQEBCwUA
MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xOTA3MjQwNjU4NDJaFw0x
OTEwMjIwNjU4NDJaMBMxETAPBgNVBAMTCGJpdXJvLmx0MIIBIjANBgkqhkiG9w0B
AQEFAAOCAQ8AMIIBCgKCAQEAr0baqXh3G+VVgPe/wwgLri3WzO+R2zpeg6pzHrxa
x7v9wuYnLavE8msyjtg7eMAZsePdg+/Nt/KyHqLZLGl+X2d04ZG+Q5SA9ihdZkbT
7LQnNG8uxfEG1F1i7lNSGmcAcrb1BMXNbJ5CJ5SYFfI2HPcTGgQJ7nn3t7QJ5UEd
WEht9+uv150ZVeU3zlgFDySEfI3nnyoJZjLulihBFwWhL92mQT+QW7tWoZANAKvE
o/TqIcEqwDhYQlbUVrVnGqmi+Nq0wPgjVj+HiDy5VXNCCSTtqaoR7dwqnDG+1d8w
qxistc0kYpGfRdc55/wyFLIL+hxvSBQg+I0heCyj+nmjzQIDAQABo4ICmTCCApUw
DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAM
BgNVHRMBAf8EAjAAMB0GA1UdDgQWBBReKBrlkqo4UUp3YF5HI/doFJ67SjAfBgNV
HSMEGDAWgBSoSmpjBH3duubRObemRWXv86jsoTBvBggrBgEFBQcBAQRjMGEwLgYI
KwYBBQUHMAGGImh0dHA6Ly9vY3NwLmludC14My5sZXRzZW5jcnlwdC5vcmcwLwYI
KwYBBQUHMAKGI2h0dHA6Ly9jZXJ0LmludC14My5sZXRzZW5jcnlwdC5vcmcvMFEG
A1UdEQRKMEiCCGJpdXJvLmVlgghiaXVyby5sdIIIYml1cm8ubHaCDHd3dy5iaXVy
by5lZYIMd3d3LmJpdXJvLmx0ggx3d3cuYml1cm8ubHYwTAYDVR0gBEUwQzAIBgZn
gQwBAgEwNwYLKwYBBAGC3xMBAQEwKDAmBggrBgEFBQcCARYaaHR0cDovL2Nwcy5s
ZXRzZW5jcnlwdC5vcmcwggECBgorBgEEAdZ5AgQCBIHzBIHwAO4AdQDiaUuuJujp
QAnohhu2O4PUPuf+dIj7pI8okwGd3fHb/gAAAWwi/VKIAAAEAwBGMEQCIALeyFzO
ITHL8dZIC04+PnKojACZgpLuWme6w2YhFUurAiAXDRLHY+JFqcG4O3+HktE/6f9C
Tg8Cp34m2M+SFCMMvAB1ACk8UZZUyDlluqpQ/FgH1Ldvv1h6KXLcpMMM9OVFR/R4
AAABbCL9UnkAAAQDAEYwRAIgbZZMtstT4JYXfYgsklR9AyKfe3xxipqvfG+CwB9w
ox4CIGMpILxso8rntlP2BeOlgf7QSIsbPUUmoDMjmWWuPc8FMA0GCSqGSIb3DQEB
CwUAA4IBAQCUOX1+qDdrI38kFc5OVLfrNcb6gU0VeK0B04hpdf4hsTvnCWkThSQi
xx7OX8Dr6C4buOB0AP5OR4/K7d9WqZ+vhLkNDEqeBND6Zuvx808/hZpyt6UuSijX
m34KnMmr2Nf/wUE55WGWLt/r+SjoAbNFF6+zs8Lx9Wnu6floXdnUinKkJJZX+CN/
S5OFWKRQcsCM5IuwVMIAXw1Kt9vm2bQbvYTbFFJWl/kcAqcP5/d+lmbAWM28uS9S
C+uwlVdSVH4U8vB/uMqVf70eToUwmCWJySFlPBWKi5y4zQBkERf9ve+U+tW0H4QB
2JLZ3Py2o3KvKNmDcvs1K3FuMM9y34nd
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
-----END CERTIFICATE-----
-----BEGIN PRIVATE KEY-----
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCvRtqpeHcb5VWA
97/DCAuuLdbM75HbOl6DqnMevFrHu/3C5ictq8TyazKO2Dt4wBmx492D78238rIe
otksaX5fZ3Thkb5DlID2KF1mRtPstCc0by7F8QbUXWLuU1IaZwBytvUExc1snkIn
lJgV8jYc9xMaBAnuefe3tAnlQR1YSG3366/XnRlV5TfOWAUPJIR8jeefKglmMu6W
KEEXBaEv3aZBP5Bbu1ahkA0Aq8Sj9OohwSrAOFhCVtRWtWcaqaL42rTA+CNWP4eI
PLlVc0IJJO2pqhHt3CqcMb7V3zCrGKy1zSRikZ9F1znn/DIUsgv6HG9IFCD4jSF4
LKP6eaPNAgMBAAECggEADE3MfrYConYsVOPPVckETONR30v38Kw9wz9dWmx9cOTs
8NgIKwgSSLQmtelO73CIvTiSLbdRORbz0vu6hAgZw2e3SDhbY1IS5XS67bmOGeEh
mWgun92GDbVKgxFdQ5Y0bVkThRS/kV7gpPek33GDw+/CKwLakZ+FOKOOSEYUYcSB
22li65i72OSrHd4r0YKp1roWWVT2FelsYecpWw70it3REBWgrW+gmsp17MPAyRMD
SbpdrM6pPF6kIDPvIpfZRpVmccttMzi4obXOS1xgH6go64VBAoiBEUFTCa1Xsr2d
DJEiaNArSCG4LlOYRd6JDGpEmuEYYwKnezArWTFuAQKBgQDw3eNINb3Z1gVgsTF4
mhCUMNDgLLf6BHzCMaYcXsI2LOXDtGkuZ/aoxs/vdjXgWHidSfV5yLCMxBIQB7BR
POAr2Hk/UXt7jLhTT3b3hPJPzOQvgkc9/rBGKP+jGBagYa9SvykBU1L0UwkFwC+g
FquSn92DUqwtMG3dUAqt2DE9AQKBgQC6SgOZzFlsF8J1ZbJ14fp2DCOUp1HmtiBU
cI2l1Zlw+cRG8PZH9kFhO/0JMI3meYQgSOpp0E8d7mcEa/PYGP7PN9NkghuUv30H
ZxLTo8hXUJNmnMopOUqTW/ERzvT55gKcz+3XcHtmdYvFzn/iZybH+7aWbB2tfqq+
ZGq3e+nKzQKBgQCs2D2CEvai/F8tjNoYVk5xWTp6s/xt0IyKekBeeW1anQtgTfVw
lLA/WzPZ/fUZgcND88/QzcBLs2PW1v2ivlGLhTM0yc8X0NpxBkQzyNZth3Vz1kQz
a7GpF0CjE+UgwBilA4J0bgvIQlHmK4zBj6Mde9TkqQ3e+7LLLuYK7GohAQKBgGW8
bBD/P8q/gwx4GKk2W4FCid/yLNFRn4Bd442whFbloKKZj/am7ve6Oitdn/FBZb33
9EULZVnUS+BnUEkxBV+HfmQChiuLFC4JxYddh9jfgVBlyiYPSsIFUTdHjhQ34C9h
guPIYywGf+nsJ30ulkhbGFE4BFEuvvKxhnJkMr71AoGAXiB9XrQh+iutvH5VlfE5
QefDP7Q1KCzaf6qhVxzMxliCWpKkzWT5jEs7bP3dxa7F4m2NY98YJD7pkA/7oDGI
0drl9sWiR9pSb/NNGeAOoBx9eGlmmXp6DX3cvVmClrG4fdSDH11ox0p/FxFLkeey
TkguixbO1W1Kdzy5uKNJCzs=
-----END PRIVATE KEY-----
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -13,6 +13,9 @@ include h5bp/cross-origin/requests.conf; ...@@ -13,6 +13,9 @@ include h5bp/cross-origin/requests.conf;
root /var/www/html; root /var/www/html;
index index.php; index index.php;
ssl_certificate /etc/letsencrypt/biuro/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/biuro/private.key;
location / { location / {
try_files $uri $uri/ /index.php?$args; try_files $uri $uri/ /index.php?$args;
} }
......
...@@ -55,9 +55,6 @@ server { ...@@ -55,9 +55,6 @@ server {
include /etc/nginx/conf.d/server-shared.conf; include /etc/nginx/conf.d/server-shared.conf;
ssl_certificate /etc/letsencrypt/biuro.lt/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/biuro.lt/private.key;
return 301 https://www.biuro.lt$request_uri; return 301 https://www.biuro.lt$request_uri;
} }
...@@ -68,18 +65,10 @@ server { ...@@ -68,18 +65,10 @@ server {
include /etc/nginx/conf.d/server-shared.conf; include /etc/nginx/conf.d/server-shared.conf;
ssl_certificate /etc/letsencrypt/biuro.lt/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/biuro.lt/private.key;
# 301 redirects # 301 redirects
include redirects/biuro.lt.conf; include redirects/biuro.lt.conf;
} }
server { server {
listen 443 ssl http2; listen 443 ssl http2;
listen [::]:443 ssl http2; listen [::]:443 ssl http2;
...@@ -87,9 +76,6 @@ server { ...@@ -87,9 +76,6 @@ server {
include /etc/nginx/conf.d/server-shared.conf; include /etc/nginx/conf.d/server-shared.conf;
ssl_certificate /etc/letsencrypt/biuro.lv/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/biuro.lv/private.key;
return 301 https://www.biuro.lv$request_uri; return 301 https://www.biuro.lv$request_uri;
} }
...@@ -100,30 +86,10 @@ server { ...@@ -100,30 +86,10 @@ server {
include /etc/nginx/conf.d/server-shared.conf; include /etc/nginx/conf.d/server-shared.conf;
ssl_certificate /etc/letsencrypt/biuro.lv/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/biuro.lv/private.key;
location =/robots.txt {
root /var/www/html/biuro.lv;
}
location =/sitemap.xml {
root /var/www/html/biuro.lv;
}
location =/old-sitemap.xml {
root /var/www/html/biuro.lv;
}
# 301 redirects # 301 redirects
include redirects/biuro.lv.conf; include redirects/biuro.lv.conf;
} }
server { server {
listen 443 ssl http2; listen 443 ssl http2;
listen [::]:443 ssl http2; listen [::]:443 ssl http2;
...@@ -131,9 +97,6 @@ server { ...@@ -131,9 +97,6 @@ server {
include /etc/nginx/conf.d/server-shared.conf; include /etc/nginx/conf.d/server-shared.conf;
ssl_certificate /etc/letsencrypt/biuro.ee/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/biuro.ee/private.key;
return 301 https://www.biuro.ee$request_uri; return 301 https://www.biuro.ee$request_uri;
} }
...@@ -144,67 +107,8 @@ server { ...@@ -144,67 +107,8 @@ server {
include /etc/nginx/conf.d/server-shared.conf; include /etc/nginx/conf.d/server-shared.conf;
ssl_certificate /etc/letsencrypt/biuro.ee/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/biuro.ee/private.key;
location =/robots.txt {
root /var/www/html/biuro.ee;
}
location =/sitemap.xml {
root /var/www/html/biuro.ee;
}
location =/old-sitemap.xml {
root /var/www/html/biuro.ee;
}
# 301 redirects # 301 redirects
include redirects/biuro.ee.conf; include redirects/biuro.ee.conf;
} }
# server {
# listen 443 ssl http2;
# listen [::]:443 ssl http2;
# server_name biuro.lv www.biuro.lv;
# include /etc/nginx/conf.d/server-shared.conf;
# ssl_certificate /etc/letsencrypt/biuro.lv/fullchain.pem;
# ssl_certificate_key /etc/letsencrypt/biuro.lv/private.key;
# # 301 redirects
# include redirects/biuro.lv.conf;
# }
# server {
# listen 443 ssl http2;
# listen [::]:443 ssl http2;
# server_name biuro.ee www.biuro.ee;
# include /etc/nginx/conf.d/server-shared.conf;
# ssl_certificate /etc/letsencrypt/biuro.ee/fullchain.pem;
# ssl_certificate_key /etc/letsencrypt/biuro.ee/private.key;
# # 301 redirects
# include redirects/biuro.ee.conf;
# }
...@@ -178,42 +178,3 @@ http { ...@@ -178,42 +178,3 @@ http {
include /etc/nginx/conf.d/www-biuro.conf; include /etc/nginx/conf.d/www-biuro.conf;
} }
# user nginx;
# worker_processes 1;
# error_log /var/log/nginx/error.log warn;
# pid /var/run/nginx.pid;
# events {
# worker_connections 1024;
# }
# http {
# include /etc/nginx/mime.types;
# default_type application/octet-stream;
# log_format main '$remote_addr - $remote_user [$time_local] "$request" '
# '$status $body_bytes_sent "$http_referer" '
# '"$http_user_agent" "$http_x_forwarded_for"';
# access_log /var/log/nginx/access.log main;
# sendfile on;
# #tcp_nopush on;
# keepalive_timeout 65;
# gzip on;
# brotli on;
# ################################
# # DO WHATEVER YOU WANT HERE :) #
# ################################
# include /etc/nginx/conf.d/*.conf;
# }
file_uploads = On file_uploads = On
memory_limit = 64M memory_limit = 64M
upload_max_filesize = 64M upload_max_filesize = 10M
post_max_size = 64M post_max_size = 10M
max_execution_time = 600 max_execution_time = 600
location =/robots.txt {
root /var/www/html/biuro.ee;
}
location =/sitemap.xml {
root /var/www/html/biuro.ee;
}
location =/old-sitemap.xml {
root /var/www/html/biuro.ee;
}
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# CV security redirects # CV security redirects
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
......
location =/robots.txt {
root /var/www/html/biuro.lv;
}
location =/sitemap.xml {
root /var/www/html/biuro.lv;
}
location =/old-sitemap.xml {
root /var/www/html/biuro.lv;
}
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# CV security redirects # CV security redirects
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment