Переглянути джерело

added params for multiple domains

cia-freehand
toj 7 роки тому
джерело
коміт
6020307a94

+ 0
- 0
kill_production.sh Переглянути файл


+ 7
- 2
nginx/Dockerfile Переглянути файл

@@ -1,7 +1,7 @@
1 1
 FROM nginx
2 2
 
3 3
 ### Copy files from the temp build
4
-COPY ./nginx/temp/index.html /opt/<CHANGE_ME>/public/index.html
4
+COPY ./nginx/temp/index.html /opt/app/public/index.html
5 5
 
6 6
 ### Setup SSL
7 7
 RUN mkdir -p /etc/ssl/private && chmod 700 /etc/ssl/private
@@ -10,12 +10,17 @@ RUN mkdir -p /etc/ssl/certs && chmod 700 /etc/ssl/certs
10 10
 ### Copy the SSL Certificate and Key
11 11
 COPY ./nginx/keys/letsencrypt.key /etc/ssl/private/letsencrypt.key
12 12
 COPY ./nginx/keys/letsencrypt.crt /etc/ssl/certs/letsencrypt.crt
13
+COPY ./nginx/keys/letsencrypt-freehand.key /etc/ssl/private/letsencrypt-freehand.key
14
+COPY ./nginx/keys/letsencrypt-freehand.crt /etc/ssl/certs/letsencrypt-freehand.crt
15
+
13 16
 
14 17
 ### Configure Nginx to Use SSL
15 18
 RUN mkdir -p /etc/nginx/snippets
16 19
 COPY ./nginx/configs/letsencrypt.conf /etc/nginx/snippets/letsencrypt.conf
17 20
 COPY ./nginx/configs/ssl-params.conf /etc/nginx/snippets/ssl-params.conf
21
+COPY ./nginx/configs/letsencrypt-freehand.conf /etc/nginx/snippets/letsencrypt-freehand.conf
22
+COPY ./nginx/configs/ssl-params-freehand.conf /etc/nginx/snippets/ssl-params-freehand.conf
18 23
 
19 24
 ### Move over the nginx.conf and default.config server configs
20 25
 COPY ./nginx/configs/default.conf /etc/nginx/conf.d/default.conf
21
-COPY ./nginx/configs/nginx.conf /etc/nginx/nginx.conf
26
+COPY ./nginx/configs/nginx.conf /etc/nginx/nginx.conf

+ 64
- 17
nginx/configs/default.conf Переглянути файл

@@ -1,29 +1,80 @@
1 1
 # Upstream sites for proxy-ing
2
-upstream wp {
3
-     server <CHANGE_ME>:8082;
2
+upstream craft {
3
+    server 138.68.233.29:8080;
4
+}
5
+upstream freehand {
6
+    server 138.68.233.29:8082;
4 7
 }
5 8
 
6
-### Redirect regular traffic to SSL
9
+### FREEHAND ###
10
+server {
11
+    listen 80;
12
+    listen [::]:80;
13
+
14
+    server_name freehand.com www.freehand.com;
15
+    
16
+    index index.html index.html index.php;
17
+
18
+    location / {
19
+        proxy_set_header    Host                 $host;
20
+        proxy_set_header    X-Real-IP            $remote_addr;
21
+        proxy_set_header    X-Forwarded-For      $proxy_add_x_forwarded_for;
22
+        proxy_set_header    X-Forwarded-Proto    $scheme;
23
+
24
+        proxy_pass         http://freehand;
25
+        proxy_redirect     off;
26
+    }
27
+}
28
+### SSL Stuff
7 29
 server {
8
-    listen 80 default_server;
9
-    listen [::]:80 default_server;
30
+    listen 443 ssl http2;
31
+    listen [::]:443 ssl http2;
10 32
 
11
-    server_name <CHANGE_ME> www.<CHANGE_ME>;
33
+    server_name freehand.com www.freehand.com;
12 34
 
13
-    # return 301 https://$host$request_uri;
35
+    include snippets/letsencrypt-freehand.conf;
36
+    include snippets/ssl-params-freehand.conf;
14 37
 
15
-    # root /opt/app/public/;
16
-    # WP Test
17 38
     root /var/www/html;
18 39
     index index.html index.htm index.php index.nginx-debian.html;
19 40
 
41
+    location / {
42
+        proxy_set_header        Host              $host;
43
+        proxy_set_header        X-Real-IP         $remote_addr;
44
+        proxy_set_header        X-Forwarded-For   $proxy_add_x_forwarded_for;
45
+        proxy_set_header        X-Forwarded-Proto $scheme;
46
+        proxy_set_header        Accept-Encoding   "";
47
+        proxy_set_header        Proxy             "";
48
+
49
+        proxy_pass          http://freehand;
50
+        proxy_redirect      off;
51
+    }
52
+
53
+    location ~/\.ht {
54
+        deny all;
55
+    }
56
+}
57
+
58
+### CRAFT IN AMERICA ###
59
+### Redirect regular traffic to SSL
60
+server {
61
+    listen 80;
62
+    listen [::]:80;
63
+
64
+    server_name craftinamerica.org www.craftinamerica.org;
65
+    
66
+    # return 302 https://$host$request_uri;
67
+    
68
+    # WP
69
+    index index.html index.htm index.php index.nginx-debian.html;
70
+
20 71
     location / {
21 72
         proxy_set_header    Host                 $host;
22 73
         proxy_set_header    X-Real-IP            $remote_addr;
23 74
         proxy_set_header    X-Forwarded-For      $proxy_add_x_forwarded_for;
24 75
         proxy_set_header    X-Forwarded-Proto    $scheme;
25 76
 
26
-        proxy_pass          http://wp;
77
+        proxy_pass          http://craft;
27 78
         proxy_redirect      off;
28 79
     }
29 80
 }
@@ -33,7 +84,7 @@ server {
33 84
     listen 443 ssl http2;
34 85
     listen [::]:443 ssl http2;
35 86
 
36
-    server_name <CHANGE_ME> www.<CHANGE_ME>;
87
+    server_name craftinamerica.org www.craftinamerica.org;
37 88
 
38 89
     include snippets/letsencrypt.conf;
39 90
     include snippets/ssl-params.conf;
@@ -41,10 +92,6 @@ server {
41 92
     root /var/www/html;
42 93
     index index.html index.htm index.php index.nginx-debian.html;
43 94
 
44
-    # location / {
45
-    #    try_files $uri $uri/ /index.php;
46
-    # }
47
-
48 95
     location / {
49 96
         proxy_set_header        Host              $host;
50 97
         proxy_set_header        X-Real-IP         $remote_addr;
@@ -53,11 +100,11 @@ server {
53 100
         proxy_set_header        Accept-Encoding   "";
54 101
         proxy_set_header        Proxy             "";
55 102
 
56
-        proxy_pass          http://wp;
103
+        proxy_pass          http://craft;
57 104
         proxy_redirect      off;
58 105
     }
59 106
 
60 107
     location ~/\.ht {
61 108
         deny all;
62 109
     }
63
-}
110
+}

+ 2
- 0
nginx/configs/letsencrypt-freehand.conf Переглянути файл

@@ -0,0 +1,2 @@
1
+ssl_certificate /etc/ssl/certs/letsencrypt-freehand.crt;
2
+ssl_certificate_key /etc/ssl/private/letsencrypt-freehand.key;

+ 13
- 3
nginx/configs/nginx.conf Переглянути файл

@@ -13,6 +13,8 @@ events {
13 13
 http {
14 14
     include       /etc/nginx/mime.types;
15 15
     default_type  application/octet-stream;
16
+    
17
+    client_max_body_size 8M;
16 18
 
17 19
     log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
18 20
                       '$status $body_bytes_sent "$http_referer" '
@@ -25,8 +27,16 @@ http {
25 27
 
26 28
     keepalive_timeout  65;
27 29
 
28
-    #gzip  on;
29
-
30
+    gzip  on;
31
+    gzip_vary on;
32
+    gzip_min_length 10240;
33
+    gzip_proxied expired no-cache no-store private auth;
34
+    gzip_types text/plain text/css text/xml text/javascript application/x-javascript application/xml;
35
+    gzip_disable "MSIE [1-6]\.";
36
+    
37
+    # Enable ngx_http_gzip_static_module for serving compressed files when possible.
38
+    gzip_static on;
39
+ 
30 40
     # Bring over default server config
31 41
     include /etc/nginx/conf.d/default.conf;
32
-}
42
+}

+ 21
- 0
nginx/configs/ssl-params-freehand.conf Переглянути файл

@@ -0,0 +1,21 @@
1
+# from https://cipherli.st/
2
+# and https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html
3
+
4
+ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
5
+ssl_prefer_server_ciphers on;
6
+ssl_ciphers "EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH";
7
+ssl_ecdh_curve secp384r1;
8
+ssl_session_cache shared:SSL:10m;
9
+ssl_session_tickets off;
10
+ssl_stapling on;
11
+ssl_stapling_verify on;
12
+resolver 8.8.8.8 8.8.4.4 valid=300s;
13
+resolver_timeout 5s;
14
+# Disable preloading HSTS for now.  You can use the commented out header line that includes
15
+# the "preload" directive if you understand the implications.
16
+#add_header Strict-Transport-Security "max-age=63072000; includeSubdomains; preload";
17
+add_header Strict-Transport-Security "max-age=63072000; includeSubdomains";
18
+add_header X-Frame-Options DENY;
19
+add_header X-Content-Type-Options nosniff;
20
+
21
+# ssl_dhparam /etc/ssl/certs/dhparam.pem;

+ 58
- 0
nginx/keys/letsencrypt-freehand.crt Переглянути файл

@@ -0,0 +1,58 @@
1
+-----BEGIN CERTIFICATE-----
2
+MIIFYTCCBEmgAwIBAgISAxJMYRLwhiqyGvCcOFKn4DtxMA0GCSqGSIb3DQEBCwUA
3
+MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
4
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xOTA2MjUyMjUyMzJaFw0x
5
+OTA5MjMyMjUyMzJaMBcxFTATBgNVBAMTDGZyZWVoYW5kLmNvbTCCASIwDQYJKoZI
6
+hvcNAQEBBQADggEPADCCAQoCggEBAM1DOZUvV7kgraqzY0g9YW0vVz6zRLyssqV/
7
+VKIIumjEek9MB8q2qTjHdnrAiL9eWMkYCQb/xsShbtf1YxHZMl/rbJaptN2jGxh8
8
+f2YJkMlhiYiV0m8dR5SLi0kjbeqC28XuenBiduvcvfO9uv3zAAW/MH0CpxTt7dtq
9
+V1pJLYnDdR1aqAEmOV9fLxLYKDhVLTsZV4troM4TEyhLAZgNoazcGhIPXK2g9kQ8
10
+ENUIRJApVZlGLoGr4KTIZIqDhwWaCcpSfF9oOVPnv7nNLVDn6DJkP/zsD2LEkeJa
11
+L7ZEgA8E7N+2abQRscgrakll/KYh+fuR6tcLTS4JE1uPQ3+uClMCAwEAAaOCAnIw
12
+ggJuMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
13
+AwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUeHRKcp9eARJ6UEMM7vSRIlv08vUw
14
+HwYDVR0jBBgwFoAUqEpqYwR93brm0Tm3pkVl7/Oo7KEwbwYIKwYBBQUHAQEEYzBh
15
+MC4GCCsGAQUFBzABhiJodHRwOi8vb2NzcC5pbnQteDMubGV0c2VuY3J5cHQub3Jn
16
+MC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5pbnQteDMubGV0c2VuY3J5cHQub3Jn
17
+LzApBgNVHREEIjAgggxmcmVlaGFuZC5jb22CEHd3dy5mcmVlaGFuZC5jb20wTAYD
18
+VR0gBEUwQzAIBgZngQwBAgEwNwYLKwYBBAGC3xMBAQEwKDAmBggrBgEFBQcCARYa
19
+aHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwggEDBgorBgEEAdZ5AgQCBIH0BIHx
20
+AO8AdgBj8tvN6DvMLM8LcoQnV2szpI1hd4+9daY4scdoVEvYjQAAAWuRDioPAAAE
21
+AwBHMEUCIQCL1wDJkafkw5uogoNi8o6nAjXpZcgCSll3UB1S5gDPFQIgZII28iP1
22
+/8KX4WnyYvJ/ehojbIduebji944H7QPkVAYAdQB0ftqDMa0zEJEhnM4lT0Jwwr/9
23
+XkIgCMY3NXnmEHvMVgAAAWuRDiwQAAAEAwBGMEQCIBkNlK4+EK9FObn7loy4Qxki
24
+J464c69zz+3bwxWP0WB8AiBTZmfLx5QqPmfl//HUwKAI/IrnAHhskQVp4i3aD6gI
25
+dTANBgkqhkiG9w0BAQsFAAOCAQEAaUNTu9mY2Exq3JwbFXXVxebrJq04/7UKaQWq
26
+g+JchKIcG9/AHTyNRVd9knnwDna/oidjX/tN5b0x2ckKifQNbR674aRQu9XpY/MT
27
+siyb0uvAu1+utX6GkYOgVw47FI1dPHjGWQZSqswCpf4FqbwmQuXokhRPeNjYy+3f
28
+6BwtAzVJVYCK6+UVgP3WSGdb2MEB235yHkWHgmsrIERSxKjajG1RM8OoC12G4+N+
29
+1VduykUXhxiO/foefEs4DfLjWspybyHVdnbzLmt/95Ox8aVyvx2UOoFO8bSbCTBF
30
+PAasUO2BTJO79okCKsvfRBFih7wVFF1/IjcQ9T/EfD2nC9kuxg==
31
+-----END CERTIFICATE-----
32
+-----BEGIN CERTIFICATE-----
33
+MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
34
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
35
+DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
36
+SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
37
+GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
38
+AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
39
+q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
40
+SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
41
+Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
42
+a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
43
+/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
44
+AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
45
+CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
46
+bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
47
+c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
48
+VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
49
+ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
50
+MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
51
+Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
52
+AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
53
+uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
54
+wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
55
+X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
56
+PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
57
+KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
58
+-----END CERTIFICATE-----

+ 28
- 0
nginx/keys/letsencrypt-freehand.key Переглянути файл

@@ -0,0 +1,28 @@
1
+-----BEGIN PRIVATE KEY-----
2
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDNQzmVL1e5IK2q
3
+s2NIPWFtL1c+s0S8rLKlf1SiCLpoxHpPTAfKtqk4x3Z6wIi/XljJGAkG/8bEoW7X
4
+9WMR2TJf62yWqbTdoxsYfH9mCZDJYYmIldJvHUeUi4tJI23qgtvF7npwYnbr3L3z
5
+vbr98wAFvzB9AqcU7e3baldaSS2Jw3UdWqgBJjlfXy8S2Cg4VS07GVeLa6DOExMo
6
+SwGYDaGs3BoSD1ytoPZEPBDVCESQKVWZRi6Bq+CkyGSKg4cFmgnKUnxfaDlT57+5
7
+zS1Q5+gyZD/87A9ixJHiWi+2RIAPBOzftmm0EbHIK2pJZfymIfn7kerXC00uCRNb
8
+j0N/rgpTAgMBAAECggEAI2KtcJyCwPVzOvRF71Q1kX8RyUtaVDRpb8JtsqlSiXEl
9
+rLnstfObZKBuOmcqq+L152TvWXeKqqcx1qUE+TS6THLne2myNmtB5oy/4bVQcocQ
10
+EK3TYzhm+KK91lP3RPBeNtcP4IP5AFxDmttgexsDK/pzv3lPmHoUATlp6bSn1xG9
11
+8h5ypsWy/hwEhNusI5WFjuaQCjsIycCZxwkzUM5JXl9P2ZSUdCdith6jO4WTumdB
12
+D5LnpBM86SEyBj15q3HY0ppaHEcQ5+o4MneO6WoLiO66QNCnE3cTIsWC4juFLbcc
13
+FIGx1Ri/Ay+MuoNqBwcXqTagSlSmjhQELeYC9ihwIQKBgQDsWG5f0OXAq/SO6JGV
14
+YgU4i8uhjKx/hhEDV+HVQg7PpxvYLcb/E/ibc3wBG4uh2rqJVkgOw7ZAm5M4Jc/j
15
+9bwKNZv9IYsiM1cf2zISx6l9IrqtR3HhowxiaseSTGFiY7tTl7uRiwiUlFjA8C+n
16
+OVvro7/wrF+kFQB8HJ5Sb0qhqQKBgQDeVRHg1htckBdRP0Di4pnjdFeo1cFIPJoR
17
+dCrDPnBtlVj5IvKIdEYtSESV0PFvughv7j/OpXfM+5wnjqHIp6W1KLGtXGGSmIp1
18
+b8OhvgRvb1J9pYFAMMiq3u2HtlQ+CxUrticFgWRhrdnS263HbzIIWqsySy/344uw
19
+cciLRsiBmwKBgQC6j4NwtuDlGddOB18D3//nBtKSjwyLDTTYwsJNKHuwhmSAXII8
20
+T3Nqodo8tZWfCZ09U5JFtU9j6GppY8+aThtEo9SiF5xQPt6DEu+Py3OKh6N7rG3E
21
+goQAG/G1Ff25QKhZ7+frlygKwJ7ejbnP8oMQmo2kWSyVxM5BKgX/ZEIxIQKBgQCE
22
+AEHzGWt5U1tks4dUrXDsaGC7Lt3og4J9pljVPrcFeMwwbp1Mgqw/qk5+HGWcDfmA
23
+axWbHQa5vxEBM1++gDqUCisjYFvV65cZDlg6KVT8zD1Pt/m7ILujJ2QjVQ9DHtVc
24
+9HLKg/4TOGLBHAhbBhvQdfR6kcVTCdgf1A5bEpVszQKBgF5V2aasXAl5DgRNOsBt
25
+VuJ6300374vHEvYGqFlbIBzS6qK2OM247nCyqPQSntEsIsEnp+KHMk1+9yVx3+mA
26
+cY1X7FUq3F8sD52AlgkZmVb7zfYz0J5aNgbk4xLGtqXsioZgM4+ctVADTnS6OrQf
27
+lBNJePtUlg7M6ha5qrSKgDyi
28
+-----END PRIVATE KEY-----

+ 59
- 0
nginx/keys/letsencrypt.crt Переглянути файл

@@ -0,0 +1,59 @@
1
+-----BEGIN CERTIFICATE-----
2
+MIIFdTCCBF2gAwIBAgISA8NRckyZRR/TV3Fulgn1RZqpMA0GCSqGSIb3DQEBCwUA
3
+MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
4
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xOTA0MTYxODEwMTNaFw0x
5
+OTA3MTUxODEwMTNaMB0xGzAZBgNVBAMTEmNyYWZ0aW5hbWVyaWNhLm9yZzCCASIw
6
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM02zEKd4AN5D+ghHZT3aAtz9Xix
7
+AlpQSmgP7pBzNBU25awFk49Le64Qy0Yr1iP8o7UkZKWzoXngMEBwBaL4GrkkeeH4
8
+1XOiSZLPDLxmj3scXdNMFgcvy/HkEDqOsTb/KdV48DmxaavsKLzRJIPHMJ/7d2Cx
9
+WjgDetIxldYV2fQneZC/omhTNmQe4pgWaCl13P1wMu8RxDkDjXh/JMycXsGxupm6
10
+Y7CT6IpOVMo3eeHgyHb6NDlaEvD5zfFjN5tksVfn2jt57fc9etYXFiZSjGBZF62p
11
+XxnsHLvJmS/YEA6qVW8IJzlSu5zZqM3ITwkhbYaA4NTt4S1Ethw7UGEVhWMCAwEA
12
+AaOCAoAwggJ8MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
13
+KwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUHkZ5qvH65w4t5KAeAtyJ
14
+vzAJWq4wHwYDVR0jBBgwFoAUqEpqYwR93brm0Tm3pkVl7/Oo7KEwbwYIKwYBBQUH
15
+AQEEYzBhMC4GCCsGAQUFBzABhiJodHRwOi8vb2NzcC5pbnQteDMubGV0c2VuY3J5
16
+cHQub3JnMC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5pbnQteDMubGV0c2VuY3J5
17
+cHQub3JnLzA1BgNVHREELjAsghJjcmFmdGluYW1lcmljYS5vcmeCFnd3dy5jcmFm
18
+dGluYW1lcmljYS5vcmcwTAYDVR0gBEUwQzAIBgZngQwBAgEwNwYLKwYBBAGC3xMB
19
+AQEwKDAmBggrBgEFBQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwggEF
20
+BgorBgEEAdZ5AgQCBIH2BIHzAPEAdwB0ftqDMa0zEJEhnM4lT0Jwwr/9XkIgCMY3
21
+NXnmEHvMVgAAAWonjonZAAAEAwBIMEYCIQC+PZ/IzwA6TPiur3zxyb51cF3ytqxZ
22
+fL7t6XCwTw6Y1wIhAOisGcWYd6qcrS7T+CBls1JuLBkkylPKV+5x3xQ6hL/rAHYA
23
+Y/Lbzeg7zCzPC3KEJ1drM6SNYXePvXWmOLHHaFRL2I0AAAFqJ46IVAAABAMARzBF
24
+AiBHFUVEfHO7HQD38/97JUtkwCX12tXJJIC984B/KliymwIhAP0U9N3I1vi2sdzH
25
+md3G7EnsXFrFt2jEIo2VjKW7tlfiMA0GCSqGSIb3DQEBCwUAA4IBAQCGyhm6ivmY
26
+iNXU+Xj5wQ3dM4B6KGpnCqtuNsg+K1bQ/Ew6pQLWoV/vpDf0cO+G0TGMukYEJk1c
27
+tqalZ5Vrxk6TBuqSk6Hw2gdM7H8alzLGVTBpVLFfhM1lC92Qc+qZAFCWSaSNym3h
28
+JZH2iPUPS6p/LVG7YewCCEF0mkFddQApLEgUDHpeldbzgwRPR9u/UYSQYsWyguoF
29
+Y/T87XFcvR1FIbFDk69cqcJMT1IwtmxX+jN3AVYA05wZqbCPpjPDJsNZB9oN9i4k
30
+jg9R3SLZ5lBqbIr+YrjF2N4mrY0rA9NPpn64fpLETIjjGMphaTy04sz7vI6jbmyu
31
+DwKhAZraKScw
32
+-----END CERTIFICATE-----
33
+-----BEGIN CERTIFICATE-----
34
+MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
35
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
36
+DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
37
+SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
38
+GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
39
+AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
40
+q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
41
+SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
42
+Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
43
+a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
44
+/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
45
+AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
46
+CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
47
+bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
48
+c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
49
+VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
50
+ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
51
+MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
52
+Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
53
+AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
54
+uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
55
+wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
56
+X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
57
+PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
58
+KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
59
+-----END CERTIFICATE-----

+ 28
- 0
nginx/keys/letsencrypt.key Переглянути файл

@@ -0,0 +1,28 @@
1
+-----BEGIN PRIVATE KEY-----
2
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDNNsxCneADeQ/o
3
+IR2U92gLc/V4sQJaUEpoD+6QczQVNuWsBZOPS3uuEMtGK9Yj/KO1JGSls6F54DBA
4
+cAWi+Bq5JHnh+NVzokmSzwy8Zo97HF3TTBYHL8vx5BA6jrE2/ynVePA5sWmr7Ci8
5
+0SSDxzCf+3dgsVo4A3rSMZXWFdn0J3mQv6JoUzZkHuKYFmgpddz9cDLvEcQ5A414
6
+fyTMnF7BsbqZumOwk+iKTlTKN3nh4Mh2+jQ5WhLw+c3xYzebZLFX59o7ee33PXrW
7
+FxYmUoxgWRetqV8Z7By7yZkv2BAOqlVvCCc5Uruc2ajNyE8JIW2GgODU7eEtRLYc
8
+O1BhFYVjAgMBAAECggEBAL/xmF5a8rPs4U764oN6YcwMmzZXQl8dKGtrM3XS+404
9
+OtyKnrlyHe3y8V7iE7q3TJxavPUsLkYjxp4O6YbET6KKlqIhL+2nhu+VUFFMELpT
10
+DwNa8GOqdjT7X56V5vYM9qEgLHmaEr/m9Tee22uSvU12VPORD1TDFHdUP9TtvV4a
11
+fO5gfSInlea6zEB50+00rd3OO8RMCUEAt5rTQLCY5voQP3Ago+l8b4Kx/1qUo/mw
12
+SL4t0mP4mZ48zK5HrydDSiCfUfO9aIx3pWbxmFTHBSI3vb2pNmMDVnZH56rxQaKh
13
+RfYrUteP59b7tG52shb1UrzEgS/1YUg1huUlHhtg38ECgYEA745gSOuprpKbrBG5
14
+GIg5g3vRPm0x+cxyjclhWXPsE4MP2atRJoYfxAFbGSS0tEXEle6okPRrYXBP0FuB
15
+gWydQlpe0ihCblUOfNFC7Lio0173ndX3XtrXtxL0Au+MsFFQavVTwZW93Z0GtqAq
16
+4MWtW4cg+ApMhV9TR4dOFQO204MCgYEA20zxHHG2mQkofgvTGbw0FJI0Ux45uVbB
17
+A8dX6b3n7XNMUEKd03w7SHeFQFArTm5GU1sbzsUcJBuidPrf2weu7PnHafqJroqs
18
+tNCotxOvJvTsbJXgt1/CjqwAqCSRkOUEhHkKGhyqI6sBmfIh0MhehJfvrl9IFgiX
19
+SpRkXvTzgKECgYB+6U7ZUwByG/mdD0agWIsfvVj9WZxAWq/VrfqFCYToUWb0Sm6T
20
+mjr5/D3m9CtH1i5vwCBNqy+4T2f5WoEhsAkgPgA+FlYbXbRvK+3ou2u1j3pfhBup
21
+hQcDVmcvpvlB79JK1+2ngU01OxtzZSdSLWfKNayhu9MOVZIpMuWK/Iy/QQKBgBYl
22
+LOvsZ74IeLhRxV2B7dht8y65jKa0pgUVqkEGVldaH0izkXB7yRjGSQR3lAf1htCA
23
+EMzOhsr2p28crmJV4ko35vVCwYiIpGwV7hOevz812HIWqHycBO+XWvGfz7tMBSrD
24
+dkuwvVWgvSaoltWYhkLpfOCk6oifEXgMiB42qihBAoGAXRoAbV4KsTffl0KPUq8J
25
+kixO37C1FhsCwHiqNCYqeIqKJrBXcoePHATmS90VMalnffNCbsXOf+YmTbCJIGxT
26
+DxENL5I8hNGx6aYuTb3uBEVK3T+ioRo8ZkyshJSj17zOqISfyQZuyEgr107pAJes
27
+vnR1ph0DlsxZQWPx7QSwodE=
28
+-----END PRIVATE KEY-----

+ 0
- 0
rebuild_production.sh Переглянути файл


+ 7
- 5
renew_keys.sh Переглянути файл

@@ -6,13 +6,15 @@ docker stop production_nginx_1
6 6
 sudo certbot renew
7 7
 
8 8
 ### Remove the old keys
9
-rm ~/production/nginx/keys/letsencrypt/old/letsencrypt.*
9
+rm /proxy/nginx/keys/letsencrypt/old/letsencrypt*
10 10
 
11 11
 ### Deprecate and back up the current keys
12
-mv ~/production/nginx/keys/letsencrypt.* ~/production/nginx/keys/old
12
+mv /opt/proxy/nginx/keys/letsencrypt* /opt/proxy/nginx/keys/old
13 13
 
14 14
 ### Copy over the new keys
15
-sudo cat /etc/letsencrypt/live/<CHANGE_ME>/fullchain.pem > ~/production/nginx/keys/letsencrypt.crt
16
-sudo cat /etc/letsencrypt/live/<CHANGE_ME>/privkey.pem > ~/production/nginx/keys/letsencrypt.key
15
+sudo cat /etc/letsencrypt/live/craftinamerica.org/fullchain.pem > /opt/proxy/nginx/keys/letsencrypt.crt
16
+sudo cat /etc/letsencrypt/live/craftinamerica.org/privkey.pem > /opt/proxy/nginx/keys/letsencrypt.key
17
+sudo cat /etc/letsencrypt/live/freehand.com/fullchain.pem > /opt/proxy/nginx/keys/letsencrypt-freehand.crt
18
+sudo cat /etc/letsencrypt/live/freehand.com/privkey.pem > /opt/proxy/nginx/keys/letsencrypt-freehand.key
17 19
 
18
-echo "RUN the ./rebuild.sh script now to move over the newly generated keys and restart the container"
20
+echo "RUN the ./rebuild.sh script now to move over the newly generated keys and restart the container"

Завантаження…
Відмінити
Зберегти