APITOCART-16375 Fix conflict

Taras Kubiv · Taras Kubiv · commit 71e8b3da76bf · 2022-05-18T16:18:32.000+03:00
diff --git a/var/etc/nginx/ssl/certs/dhparam.pem b/var/etc/nginx/ssl/certs/dhparam.pem
@@ -0,0 +1,8 @@
+-----BEGIN DH PARAMETERS-----
+MIIBCAKCAQEAxnrrcbbOAaj7TvqCqTHSEd2zCJT18gKRDfPekQp+4D6bcqzxz2K/
+crBTp/swt5L30g/fveLYlyZns4LFugdYkkjuniCT9gOg9sKIhEHxuAIF7bqiybft
+mVVvH+gEgMc4MH5iL+/UKfuZC8DQX9R6az1ib5pfM1/syDwbiN+j5NE1rl6az00q
++L2jCU2KeA5DJ8BGxYBXt896amjKrRniuoSGRFjH1WzaooKVSbMpW1E3BMqqaLVF
+jDYOsPv4jqg4DSIHQnDoRfStdNYx1nOWRNKq8fjQGqNWP42Qlk8m4uykPBXhREkz
+7PCWsJH2WN4g2SPLsaw8STojOj47xSYKewIBAg==
+-----END DH PARAMETERS-----
diff --git a/var/etc/nginx/ssl/certs/nginx-selfsigned.crt b/var/etc/nginx/ssl/certs/nginx-selfsigned.crt
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDczCCAlugAwIBAgIUEbsYz+5vKTsILea6kk6nbZd2y2YwDQYJKoZIhvcNAQEL
+BQAwSTELMAkGA1UEBhMCVUExETAPBgNVBAgMCFRlcm5vcGlsMREwDwYDVQQHDAhU
+ZXJub3BpbDEUMBIGA1UECgwLbWFnbmV0aWNvbmUwHhcNMjIwMzIyMTEzNTQxWhcN
+MjMwMzIyMTEzNTQxWjBJMQswCQYDVQQGEwJVQTERMA8GA1UECAwIVGVybm9waWwx
+ETAPBgNVBAcMCFRlcm5vcGlsMRQwEgYDVQQKDAttYWduZXRpY29uZTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMT/vIxd3NiSHwkr5ikXaozXEv96bAKI
+hC/b4AwnXVqhkInk0+LaTjGhv62pIn2HXgTJICXtQseuX6iNiYcKX0STq06IrMzI
+5PSIvzQCVePhq1CoL35skQF8bA5Xm6tcYL8J2C+1cn03hAR6pMt+EBw/Dfl3h2FQ
+KQpKBmuenXs1q7RL1cBIj26WOEsDtdmSlGa1qP42PgjMBEr2SSht6CEs/Fhn/lwN
+LS0MCreLkYEx9i/hnwhkGxOmiKWFCM4xV9My1v0/qGbL6HbYUFzTjQGmWxAnvYs9
+3ZJJ0LBvFxFJDShoG7PGCw66KLh58UuIfSgBVIebI1YIIQVkp9uViUkCAwEAAaNT
+MFEwHQYDVR0OBBYEFOyrq10A7F38K3z57LHFNkbo2zMVMB8GA1UdIwQYMBaAFOyr
+q10A7F38K3z57LHFNkbo2zMVMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
+BQADggEBAMGFpmYux5aW2DzpYRhhcaJc1r3s7HmEGR3VKQUpYShehwkm/z4fyBVU
+TqNHgn720V1uDsskoMLPoHKOE2+LFvhzMvGCI8oattuFLwM1P75aHnKjWu69pYA8
+8bRXU/Lwf5/jveUGCFEzAju0HYowOjewUknT3ybpIyucUtFsXRaZRS0NJ444IPMQ
+PxjogGGb15wnvx7qRK37nPGIE+l3Al7dVpn/QZvaIPQ1/qqF2kYgMKm8o7z/E6gj
+dfIwQNzPxUP6kF2wrxNgviZcP0TezImdS19O1QvZdjwN3p9i1EBbksMZwGwzLMgl
+d4uGBPwrfH/O3M3FeA4TFwAi9QLsCvc=
+-----END CERTIFICATE-----
diff --git a/var/etc/nginx/ssl/private/nginx-selfsigned.key b/var/etc/nginx/ssl/private/nginx-selfsigned.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDE/7yMXdzYkh8J
+K+YpF2qM1xL/emwCiIQv2+AMJ11aoZCJ5NPi2k4xob+tqSJ9h14EySAl7ULHrl+o
+jYmHCl9Ek6tOiKzMyOT0iL80AlXj4atQqC9+bJEBfGwOV5urXGC/CdgvtXJ9N4QE
+eqTLfhAcPw35d4dhUCkKSgZrnp17Nau0S9XASI9uljhLA7XZkpRmtaj+Nj4IzARK
+9kkobeghLPxYZ/5cDS0tDAq3i5GBMfYv4Z8IZBsTpoilhQjOMVfTMtb9P6hmy+h2
+2FBc040BplsQJ72LPd2SSdCwbxcRSQ0oaBuzxgsOuii4efFLiH0oAVSHmyNWCCEF
+ZKfblYlJAgMBAAECggEAFgSzcUjobzhdyaujbQJWAWnkkLOBMQNLKwI7V4Bq2b9n
+JVJzME7QIJIAl4to9HjV1Fkag8KyDRl7TZ6MOZC6NzL+GagDEFx/4qkKHekI6pCF
+kl1J+apuxqi+dxfpqUyI77FM/YAdTMuQsON4Wdo8OLv/dtuaQRExlRnS/+JZnbSe
+wl8TMTJa8rfGJmAJyfmWTFHkxNRP8Ttp1wuOV3SD55O4FOe2XIVVUiIUDYGY+8j/
+kjob7dG/NntSLNHjj2t9zBfkWSoyRFxt4OMrE1MZMaaaPsdd8F5Lp5vep1l5SjLi
+pYR0DGakcprZxlAdlwJKq7xXDG76aamwMoBeYBlnRQKBgQDodN2ahKmeiz9cdokw
+/dWA7hwn6lUCJQAGGei0Yc2gdqul7S2g4CEWcRjKJIdU3xLLNtNSoe/utzYDg66n
+poqj2b7onxvAcGUjpoiV+OAXG7EXD+rMiEGgZFd19mq0KTdhPXNs/ctxjAm3eIxM
+5JUhfS3fWiJuqEoYZc8FNqb0RwKBgQDY84cPbrtZath0GMMRJHQywObpp3c+AK/k
+PlrN86UpA0Dec+cJtCFtHH/zG3gKQjkNbuoWBboR3KXmHDVbaZkHy9IRWXkYoHAg
+cDxMP+C1uTsP4QHjSTlmCbiuAIEhmUDbm9z3p3N1OZnRNqLAE8bPPfXI9TP3g2pw
+52ti84Et7wKBgQCXiU/JYkA89aOZgECRKnhbc13xe2ZtXnd0gsFbjgKBX7soEMTV
+AicvvQyfAk8iucVDqnr6fEywPsk8Y0ShUAVDKTi15rstqVeVdQPHWJWlGs1ILn0v
+VogJqkAFy1zmE5RhlLDBVXWhkNvoufIkUkMRsMwNtXGK17Rt0Tiyulz+EwKBgCZ8
+fRclw6KHK8Lcqa4e02Y1hkEo7iRXptxMm3sxn7j41MchtHiqNcvPZHtSAid/u/NA
+G9KwTWPhyqRZmLWQtA8H/0oIn0zZGUsH3gqAwnI6W9njRpx1XvNVAigL+txk/XZ3
+3ekpEXhYMYtFr/V3DKuzCCkQJpnf/D/vLcOuAtqNAoGAUoF9pyH1SELjzW+3uAJK
+Et3E5VdrwW+bZkQqZAYlfhLxqIA1Ss9rszTPby1jTBKsj9lMt0HvnOgfaAnTTh/z
+th/O9LUVGzfUUZcqD15fHDsVMIOqsEjkubYff19ppJFo0bNualZHH/V7hv8RRGs4
+46NwK3m4LE9MsTyN8ZtOlEk=
+-----END PRIVATE KEY-----
