From 6d7d8f6f946f43a8012915a17488ab44e087b0a2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 13 Sep 2019 10:00:56 +0300 Subject: [PATCH 1/2] Updated docker-compose version to lates in Travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6cc8c49b..5866462e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ matrix: env: global: - DOCKER_COMPOSE_REPO=https://github.com/docker/compose - - DOCKER_COMPOSE_VERSION=1.22.0 + - DOCKER_COMPOSE_VERSION=1.24.1 - STONEHENGE_NETWORK_NAME=stonehenge-network install: From 0313a861023695819f1ed6035c8edc7d81809a56 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 13 Sep 2019 10:02:20 +0300 Subject: [PATCH 2/2] Updated certs after mkcert 1.4.0 update Simplified cert install process Removed dependency to tput Added make restart command --- certs/rootCA.pem | 53 ++++++++++++++++++++++---------------------- certs/stonehenge.crt | 47 ++++++++++++++++++++------------------- certs/stonehenge.csr | 16 ------------- certs/stonehenge.key | 52 +++++++++++++++++++++---------------------- make/ssl.mk | 44 ++++++++++++++++-------------------- make/stonehenge.mk | 50 ++++++++++++++++++++++++----------------- 6 files changed, 126 insertions(+), 136 deletions(-) delete mode 100644 certs/stonehenge.csr diff --git a/certs/rootCA.pem b/certs/rootCA.pem index 34eedc65..b4fa4ca4 100644 --- a/certs/rootCA.pem +++ b/certs/rootCA.pem @@ -1,28 +1,29 @@ -----BEGIN CERTIFICATE----- -MIIEsjCCAxqgAwIBAgIRAJ6qsiKzEgdXSaOWBVHzwMQwDQYJKoZIhvcNAQELBQAw -cTEeMBwGA1UEChMVbWtjZXJ0IGRldmVsb3BtZW50IENBMSMwIQYDVQQLDBptYXJr -b2tvcmhvbmVuQE1hcmtvcy1NQlAtMjEqMCgGA1UEAwwhbWtjZXJ0IG1hcmtva29y -aG9uZW5ATWFya29zLU1CUC0yMB4XDTE5MDMxMTE0MjYzMVoXDTI5MDMxMTE0MjYz -MVowcTEeMBwGA1UEChMVbWtjZXJ0IGRldmVsb3BtZW50IENBMSMwIQYDVQQLDBpt -YXJrb2tvcmhvbmVuQE1hcmtvcy1NQlAtMjEqMCgGA1UEAwwhbWtjZXJ0IG1hcmtv -a29yaG9uZW5ATWFya29zLU1CUC0yMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIB -igKCAYEAyxtj9pyN+pDgvIT6LOKoWnOhD21L/kUCwAmavdKA4eJNPMs2uli7zZFd -Wi7S5LM8aS0iUZqgy4S/i9pkEtK++spG/WQHYe5wGKcBjx5cJdWLdCxDpx2Ozt5l -B45StEDxj7xKaQMCW6YrZLdqm9lAFxMtIcCpO/Ec6PRxdgCZ1IeNwqHoCXPhsDcq -uKz1VJ/ELtHQdgIaptvWCychSNd8I31KYBF3dGG/BJSJ20yt3p51bBwNDSsCaeFp -tXPN1CP7greZ6pTyL4waoxVDHbMMDNK8kiwsD2fkWqb1njo9qNLtSvFk8cnO0/jP -5yhzGj4HGhlUdQ3WeECdqG8g+dRsk/fZWx4o//xYxvn0rNhndC2DHvxP8a+QDL/z -xe+S7A5zrwYHsK+l5KOEtLUXoztWYa1fl8O10GGgnj9NlmWQ8w60/b4KMPXXff9V -hAIBcW4qipa8JHE1UpA9oTV0P2E6ri3eSd6oQJphluMpLhX0icJKKHbK4FNLUUhp -vjHjYN3TAgMBAAGjRTBDMA4GA1UdDwEB/wQEAwICBDASBgNVHRMBAf8ECDAGAQH/ -AgEAMB0GA1UdDgQWBBSvDtvU48A5ajBiJMhwAk+uhqX9RzANBgkqhkiG9w0BAQsF -AAOCAYEAZReHNIB9sLKoNukN+U7+hzReSeZbwJGMR25kgOrLkfXYxp1E6pWfMKYv -CCHq9GlLDDb9XNqAOGRPV8ZoPgZ5SagQIV6iUH7WrwhoEsABF6ZUdImYfchohJIT -OWumE6Qq9U1U6kLrOKTzo+GLddF1w13nxwJmutKHfBClgHZeTFfEpZWsHtzy40Em -eOGyyg7WS3AsWXWyRG2bGrh0t9xRvZjGh15ODVACSZ6O0fD8a/pDAz6wl6xPKt5P -NiQa/HZ9/8G0lzBh9OHEoQNQm3I+WAD8zDy8KxdrG5uIwMuqPnD8uDHykBMofY6w -lRjq1u691f5Nqsc7o8YTZnygMPYVTMxFWBDQbqNqXPk8+aQArekWinVouD7EtPX6 -iTiEyjDyU5jAOlxwMB92JSCGFbFnRKWrJMRPu6Q2SdTtYF8mBzlEoiz8WaIi/MIh -+wJnHAtYuaTAmIkBr62/dF0hRNDfNvAuLNwT2iGXrSlOq/WqBiUYhMED3Fv3pQ55 -r2GSLoss +MIIE9zCCA1+gAwIBAgIQGZO6kTP5j7mxs/tBA1+iozANBgkqhkiG9w0BAQsFADCB +kzEeMBwGA1UEChMVbWtjZXJ0IGRldmVsb3BtZW50IENBMTQwMgYDVQQLDCttYXJr +b2tvcmhvbmVuQE1hcmtvcy1NQlAtMiAoTWFya28gS29yaG9uZW4pMTswOQYDVQQD +DDJta2NlcnQgbWFya29rb3Job25lbkBNYXJrb3MtTUJQLTIgKE1hcmtvIEtvcmhv +bmVuKTAeFw0xOTA5MTMwNjU0NTFaFw0yOTA5MTMwNjU0NTFaMIGTMR4wHAYDVQQK +ExVta2NlcnQgZGV2ZWxvcG1lbnQgQ0ExNDAyBgNVBAsMK21hcmtva29yaG9uZW5A +TWFya29zLU1CUC0yIChNYXJrbyBLb3Job25lbikxOzA5BgNVBAMMMm1rY2VydCBt +YXJrb2tvcmhvbmVuQE1hcmtvcy1NQlAtMiAoTWFya28gS29yaG9uZW4pMIIBojAN +BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA5jsImOsfZWGdgQKctMzi9Tzb7DG7 +Jhp22S9a2okKEnnpts+cemoEKZAWBloUq58yS9IVAZf5Md6Hoea51wZ8icwOfmb9 +I+5h7rUNxJSy/aqfIF2xKlfY6QdKn51jCxg1NAcbLwgWxyLemRN9oX7QNqLRNbNf +pmLaW9uCf6GjSXnjZcphQ3wsxEdNWtVJzpo0daiQwe5092zalWJKsxmUvdyhEW+I +pLWUWfCyDWPGMUDKJ5/2YnBrd8tPad2hwgEFxBnd5TqzAHTOWm/frRkkjo0yNCqd +Wfi2dhLss/z8Dy0IfTGyc0bLcRMYyjVJffIMvZBjRs/AqDxokKUXMrkOD1aBQM0X +sN/mu3wB6zakEkpiWl+0H660O5eSoKMWJeJuXVb6z+iMIk56PiPk+T0IcMWKlCUf +O5sA/YXmJ7HZzdRZ7so4+p9v6gdmFABoF2pLg12jGBIHI/eDPe8YJ3jzr6Np7L2D +2CvdhK3sdweNZdsx72aaJMGHWhpTJjwxnkupAgMBAAGjRTBDMA4GA1UdDwEB/wQE +AwICBDASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBTqP90HRovK9mdttr3M +15p8l6pkYDANBgkqhkiG9w0BAQsFAAOCAYEA4xhvMuVrezdOmiXiYoQDe9keSN1T +9PXvEgKTOiKxQk23nmr2DRFYpgqOP3JA3ZjBjdKzW8jLekPpWccZYaRfq0uf/bek +phoqyCK/PFgXYM6ddnKTTEgkim2LAvN3E20oaYijgxYSLogtFYYJh1D2oXTICNsl +p9xVcOqqklnz0YaTJ3MySU9yDCwBRFOeJvswSObPYB581cTLYG360MAbywLG2jSc +aHB28k0ikLQ4wJazwBUOn5EERgQY+lzUd/0WM5jmayvFGQFAZCecNEGX28sRK50B +k5cVijJopZsqQ2N5HiUDdKKIA3BiKcOAsmPj/K6fL6yLSdCfAijjxm7y1DkAPErg +uZb4/pga2F9uwn3amQH5TdmOENAqUziYz+FfEUTa0R2IkJdSA6WcEtH8chuCiCvl +BzdmEONXLlOk+LmjxzMyVy6NsD59JbM6E/zzw4Dmir8KCYosZ7OcXtyXH6t225ME +TczfkP1CZU/69z01cQEnY/CEyWnLoyIfhjha -----END CERTIFICATE----- diff --git a/certs/stonehenge.crt b/certs/stonehenge.crt index dc2a93d9..f4185c0a 100644 --- a/certs/stonehenge.crt +++ b/certs/stonehenge.crt @@ -1,25 +1,26 @@ -----BEGIN CERTIFICATE----- -MIIEKjCCApKgAwIBAgIRALF0deZyW9gUBhwIzMm6aDcwDQYJKoZIhvcNAQELBQAw -cTEeMBwGA1UEChMVbWtjZXJ0IGRldmVsb3BtZW50IENBMSMwIQYDVQQLDBptYXJr -b2tvcmhvbmVuQE1hcmtvcy1NQlAtMjEqMCgGA1UEAwwhbWtjZXJ0IG1hcmtva29y -aG9uZW5ATWFya29zLU1CUC0yMB4XDTE5MDMxMTE0MzY0MVoXDTI5MDMxMTE0MzY0 -MVowQDETMBEGA1UEChMKU3RvbmVoZW5nZTETMBEGA1UECxMKU3RvbmVoZW5nZTEU -MBIGA1UEAwwLKi5kb2NrZXIuc2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK -AoIBAQDSww2wqkTOV3GjbjLUYr10DfflM5CJJR8quylcRSBg/VkNJgT/zOriTNdA -GCsady0aVO8zUap7KvDbvus+zAx0NC1dRjs/a+syqHiL7BEIhImc9wBx81pSvWKv -atT+HkxDFW9gmoPzePLO2aE7EXtC0wOHMzC7+ibjhncQG0uAdMAOR/3QLFRY4M2d -R2bJKZry7ZsSWYFdA2BIM2G8lYZdRUs7t1h/DyKXnwRX6G/77CAgrn980AAFCGdn -MRbGJcAzYhtExoQWyH+t3mp55AFck7Y6TK3PoCHFiqqlvDFE1ZmjfzfTtMNTGhzJ -7ECj9bv8K32IrqELAL/3UC2n4HTBAgMBAAGjbjBsMA4GA1UdDwEB/wQEAwIFoDAT -BgNVHSUEDDAKBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMB8GA1UdIwQYMBaAFK8O -29TjwDlqMGIkyHACT66Gpf1HMBYGA1UdEQQPMA2CCyouZG9ja2VyLnNoMA0GCSqG -SIb3DQEBCwUAA4IBgQBkli8sHdhKpTHqEHd8d2bPkw/WpZOplZ5Jou+Akx4whWNx -uKvFR90LfDTkL3k+0VX0xp07jHWcgGeTdg7/e32foWuHoaKKHGZbaxCoGKYY53uc -/LcnpsYjjkjEcI2IZwPSO2CeTD8oXt6jQUDxvOSdTAlRtuHhQ031I1oz1VTEE0jW -w822Hhk7AcN0XZP8Y23Z8vlzTGqy+x6i+1G4FaOo9Tmq4M95s8Wvyb03E7+VoVnH -u2Ps7J1jQBuxA/7U2HjT3BlhS3VejE2epOK8OJQpLaQlixyFVkfqU/BHt7Kkx2bJ -CawpwAGS93nWVWmVLIUHs2V5d06UiPqPVMrWCis54uPh5unMZ6imyO8j81mLn90j -qkWxGFveS6LxYopIO1Y0iZzpgP98GDgW9MQbn+0WMDddjiOLpFUDDygHeDGOkmyc -5ABaee+qUukt3tJm4VNw49M03NP9SV4+RZnSXF9swkWqJ9dcSTxe9ClY57kiVueo -y5fljvE1II3OXHRoaqg= +MIIEbDCCAtSgAwIBAgIRAOosUrLiuWbTZhRSec6G5iMwDQYJKoZIhvcNAQELBQAw +gZMxHjAcBgNVBAoTFW1rY2VydCBkZXZlbG9wbWVudCBDQTE0MDIGA1UECwwrbWFy +a29rb3Job25lbkBNYXJrb3MtTUJQLTIgKE1hcmtvIEtvcmhvbmVuKTE7MDkGA1UE +AwwybWtjZXJ0IG1hcmtva29yaG9uZW5ATWFya29zLU1CUC0yIChNYXJrbyBLb3Jo +b25lbikwHhcNMTkwNjAxMDAwMDAwWhcNMjkwOTEzMDY1NTAxWjBfMScwJQYDVQQK +Ex5ta2NlcnQgZGV2ZWxvcG1lbnQgY2VydGlmaWNhdGUxNDAyBgNVBAsMK21hcmtv +a29yaG9uZW5ATWFya29zLU1CUC0yIChNYXJrbyBLb3Job25lbikwggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQ5ZTXBUg6k+oo+7sk7cr49MXEiRix9N4b +pb9Vgin26wooDTc2jxOiMcNhcmJdfX0+sPtALIF+hrsTbB3ZibLUB/Eh2RV/rr3d +lRdGQduhYstWDzj7av8EXvtajWhF1sTUxsm+AGa6rYEPFVOVL+Fe6kin/9LwWyts +EYKeH7czhKiwLIndA4kLwXLru6sOxswGmaWkUwD98s8g5yI4OPwzkER4G/NrDMCA +hU2MuA8J6jS9QkAiowNZyEQ4PRnMcxbSFVrvyzNFmQZalaobn5uTMcotSoSP+W+g +oQ1cro/56ZajIEFoLTLudKzjs519Vy6CkT462x8MggAS350TCcq7AgMBAAGjbjBs +MA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAMBgNVHRMBAf8E +AjAAMB8GA1UdIwQYMBaAFOo/3QdGi8r2Z222vczXmnyXqmRgMBYGA1UdEQQPMA2C +CyouZG9ja2VyLnNoMA0GCSqGSIb3DQEBCwUAA4IBgQDP8I0D3+qP29LY0LJ+/lM8 +GkLBcGYQBAWaNRW49gHE5sl9uiazIXQesqsL8CBMoGdDtBsH6sPFBuBTBwJtE4OR +IgMt4wDm4jnHZXyuyifhETsRzay4q3/Sk8j3eIGwTyrRlGbw+XF7nHUU7S9X9t3+ +R8hV8rSS0P+8inIPOhWneL1qpt39yKXb73mCHDRRhqhXLaJ+aqnYEiRmg9nzNNBy +5OVx4n1Iqz4PQ7KrfBWISpBG2qOaJ7NprM2Ay6cRO2gEcHlm6NV1Ja0BWJaYV97B +i6i8GnxkoN4jKBb+vI2YWTr39kYEvah/FhfPd2TkbfXg/0ti/GM/xxOiJD+aOF6Y +RnWZNo9xo+Z+uYsKCt9Xl4CCg9SMh/8huZPkTYOzWNAfg+MXNWL3oBLECZ5mP2Fn +7WejAlVpnI9CZdOX4axrn1nQpqpPNvmw+JCqOMp5rhN734rS2zRg9SyTu5zEIdUx +r3nykMZ38mHssWDDRgXQEf14eOloqbbanR38xq/kKVw= -----END CERTIFICATE----- diff --git a/certs/stonehenge.csr b/certs/stonehenge.csr deleted file mode 100644 index 898991b5..00000000 --- a/certs/stonehenge.csr +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIChTCCAW0CAQAwQDETMBEGA1UECgwKU3RvbmVoZW5nZTETMBEGA1UECwwKU3Rv -bmVoZW5nZTEUMBIGA1UEAwwLKi5kb2NrZXIuc2gwggEiMA0GCSqGSIb3DQEBAQUA -A4IBDwAwggEKAoIBAQDSww2wqkTOV3GjbjLUYr10DfflM5CJJR8quylcRSBg/VkN -JgT/zOriTNdAGCsady0aVO8zUap7KvDbvus+zAx0NC1dRjs/a+syqHiL7BEIhImc -9wBx81pSvWKvatT+HkxDFW9gmoPzePLO2aE7EXtC0wOHMzC7+ibjhncQG0uAdMAO -R/3QLFRY4M2dR2bJKZry7ZsSWYFdA2BIM2G8lYZdRUs7t1h/DyKXnwRX6G/77CAg -rn980AAFCGdnMRbGJcAzYhtExoQWyH+t3mp55AFck7Y6TK3PoCHFiqqlvDFE1Zmj -fzfTtMNTGhzJ7ECj9bv8K32IrqELAL/3UC2n4HTBAgMBAAGgADANBgkqhkiG9w0B -AQsFAAOCAQEAPxl1o7JaZfKXx5AwX8rwiIg8dK6nD4QWMBzW2A/sqDZwDPYPLrni -fG1V+Kw57rMcFRnoM7fYlNwjH0WR6dDhx9bAJgHJ0GZJsmIJf+aPMAk+0AGuvNIF -wNFvag9KSLkdYrhv91aUrPKj6jDzzL4YXbsmKoABqPv5FzASbqJaGrbFSO5r2kFd -02WTNumWjPygVFAivsmC0p89Gf04voiXs6jSNiJs7R2ZKPEdXwLvYMWeql5J3RMy -eir1B6etfq0EE4Don0Tzb2COVOfhQELi6O+d5xsrFoI0aElK0r2qybpMH4N4YoMU -ggPPKXQFw+ZXITfV5BH4CKSw41LE+sWRpg== ------END CERTIFICATE REQUEST----- diff --git a/certs/stonehenge.key b/certs/stonehenge.key index 88c55503..a15b7289 100644 --- a/certs/stonehenge.key +++ b/certs/stonehenge.key @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDSww2wqkTOV3Gj -bjLUYr10DfflM5CJJR8quylcRSBg/VkNJgT/zOriTNdAGCsady0aVO8zUap7KvDb -vus+zAx0NC1dRjs/a+syqHiL7BEIhImc9wBx81pSvWKvatT+HkxDFW9gmoPzePLO -2aE7EXtC0wOHMzC7+ibjhncQG0uAdMAOR/3QLFRY4M2dR2bJKZry7ZsSWYFdA2BI -M2G8lYZdRUs7t1h/DyKXnwRX6G/77CAgrn980AAFCGdnMRbGJcAzYhtExoQWyH+t -3mp55AFck7Y6TK3PoCHFiqqlvDFE1ZmjfzfTtMNTGhzJ7ECj9bv8K32IrqELAL/3 -UC2n4HTBAgMBAAECggEASv+f6oLckzSouohnTA6K7jZeRVBxGWx9R75sPGpY2Eqv -Gq+xzbkEyFyhqCwxgmxwP1OD/xYLfWLNbNTmb2U69Urv7aYlRS9I9bDfnKL3eLl5 -IsL+hI4dUR4VdOimPHtZlfGVvaGeXNBoTtVAu31ACIqAUecUa3/bwNFDoxajamT7 -eSI/rKXPow55tm6f+Yt0YPmWPPX9ktlcaN4C2kvBcNd1LAETmuXAWUoBE3FleliC -jdRgrJ5a1rkuunyhXzXywv610ofyLZjU/0ENpAv1756AVMSdGe958gERBs82yXne -5JYP07ql8o4SLJxiZEfzUsCSfr21l51eTm/maUshtQKBgQD61R/0C/mYwnwB3aI6 -jQ0MjQ0q0wL/Drg3tmoEaM7jriwRst9kDPRYQBdczFr/kbIFjJoyihfsj8Qhf2Gl -D6tLPxQ5/e6mY6LfEvRGl7UP6xM+jAI0zmW/lVnEcTkC2cnbOc3viJNmFeEN9hMU -nZqhSTT6r+ovSSr/mspsxo4WgwKBgQDXGplNppZWR7JdEPMpW163g5IMN4UGTw0+ -ej8s3tFc9gYGgd7MR8L1eJQWcXRVxqqWrutcZ3NagHll3SXCfCntnd1EPqrwfKJK -DHk38uUkti56pxcn0ng91l08ZlMPwxvl8qUapwbH6eT/TFmpEfR+VOlCRnXo20fW -sPUCY+EEawKBgCBQcqRjIo2uiIFJB0xZvZOfXFHnC1zGja8HvhLBWd31I1JIZAUk -shnob9oRrat9Hp0eZwMZzUk5oD/chDzajuvLvZRXBXbEIUhxzayGgNoDI+CL8wDQ -kkUjPYRUPc8DNcEbak9wneSp7ut4hy7BuxkKMFwXa6kZ2QNC8s8eqVF3AoGAe2CA -Se+hDz/0aDkOn8wOmcfXfzZhEGtLN2i6z6vF/kIG1riq6BTJGC7fEbhld8WJlwAh -c1DK8z/5YZnkzJaXHfmMLlabiXCTTVG2PYcOM25jXmp0d5za5u0LcVdnkQTh/ZSd -apoe44+ej2hljPoFeGiPmjn762HK5LN+9K4BJJ0CgYEA3XIdzTTnYMSPEP6ohND+ -VY0sn10KV2WXYQvFV6u1EbrW7A+7Q8AJkYOdNvizBQiaQ3O6IOoEL9orFlgE4nEG -pg23PQH0EU+h4ll9tsEffgRieKCsMik3BK5pB/iCh0pX/H29ypiYTf00axhRI69i -+PhAx8pXCaggV/pBEhDmJU4= +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDQ5ZTXBUg6k+oo ++7sk7cr49MXEiRix9N4bpb9Vgin26wooDTc2jxOiMcNhcmJdfX0+sPtALIF+hrsT +bB3ZibLUB/Eh2RV/rr3dlRdGQduhYstWDzj7av8EXvtajWhF1sTUxsm+AGa6rYEP +FVOVL+Fe6kin/9LwWytsEYKeH7czhKiwLIndA4kLwXLru6sOxswGmaWkUwD98s8g +5yI4OPwzkER4G/NrDMCAhU2MuA8J6jS9QkAiowNZyEQ4PRnMcxbSFVrvyzNFmQZa +laobn5uTMcotSoSP+W+goQ1cro/56ZajIEFoLTLudKzjs519Vy6CkT462x8MggAS +350TCcq7AgMBAAECggEATX2MrAK6m3g5OcC/2GAZliZ+onxU29bA+bKPenHRjVX9 +K4RTgfqrRtR87M4YrSOa7UGLwm+ADeZ+ySKnJAZPfxX/HhZAQmAY8HSY8KgHiCN0 +2FTHR4SWWxG83gdssdOMqn2fYssVUJSCNo0rt0DOsn3oO+HLZvv67JjGQk/zjrkw +pEy25ubxq7UYrSWL9ubRn2t3nU7FLbA7Pv8v5oSyCLEIxD/N+ZpVCvnBt4SQ5/xQ +QdNxAqhiE8DDZT4/IXpbF+pCv6H5VfrDDn51LH0Wx1KiN39oyyfMubHL/QYWl6oi +i4qpZ2qtNjZicUFArb4SPqNtnlNxFls0cnj3SAOOeQKBgQDmZshQQdJTvJGbojEQ +mdexO2RcQnb2+LUNwPEXCzyN7wWmd4Q1qJ6FGAUzITtnd/SNOO+XLdUN0XLC+DBm +rWr0jcijBewV/Y2ACtHvYfAjNnyhzxzGuBh1A3MoYOi8JUQF2q65TmgalDrKtoxi +GaLcL0TGUIQHulK9WEJAfDoLJwKBgQDoGyZLcszJPc3PqSypgqAkw2zldqRhwN0/ +JTKtfdSsYaK/ZAChXaHVdkP36NM4D1csDygJEIFgK6t403HcCLPddaP5rQU2iIqi +bK+Gga7Yl+opPZIPUfMHbI5H5Uo6VZeRljDt6p1hCy4X4l7ysxAM5xqtymFf8IOJ +OLsPOU4QTQKBgHX1b17vpBAs/dtReY9HRE+/2Y0GlkOxZ3ioLIagwRrlod3tWKnk +L2xytM7Nl81Mc88NtFSRKYAOmJPLX3RiGt0j7fHQ6WME0joY0Ayf9sMAdWSeVdxD +inn2DzJAE0eoSKA6qrPCubfJ5iO8vDjJaUETjkF+HWqbcRrxodHECC+HAoGBALPs +j+P+yvbZPRjUCLYid2foQhsivEy2yAtyF3XbzCgQy6tXpxFv1sr1kby0tD+JzMZv +vVZBgDj/wT25k1LBQETVM9aRJDBg6i7815gKIXLvWGq9uuK7YQyJP0ZGXSMZRJRr +++QCchtPIl0LcxTqb+/AmrLL5m4LsLuHyaIEhxolAoGALXwOF6Bp4WH1RVmfK1/f +Eluyi++wxE8uuPRhFtbZ0v3/MM/29z1D4Slvb5Y9EaHnA2KEfDusa+B9JVyJUZwI +MP5xrj3AZ1UdLOTJibiQekyIEHLaDb0Eh70ZLfXu6ktV/XYWGPEzJXCKCCtaWPyg +wx+EFWiRKZtxT+DvMqVxyc4= -----END PRIVATE KEY----- diff --git a/make/ssl.mk b/make/ssl.mk index f2b31135..5ba704e8 100644 --- a/make/ssl.mk +++ b/make/ssl.mk @@ -4,47 +4,41 @@ MKCERT_BIN := $(shell which mkcert || echo no) MKCERT_ERROR := mkcert is not installed, see installation instructions: https://github.com/FiloSottile/mkcert#installation +MKCERT_CAROOT := $(shell pwd)/certs +SH_CERTS_PATH := certs +SH_CERT_FILENAME := stonehenge PHONY += certs -certs: --certs-create-key-and-csr --certs-install-ca --certs-create-certs up ## Install certs +certs: --certs-install-ca --certs-create-certs ## Install certs PHONY += certs-uninstall -certs-uninstall: export CAROOT = $(shell pwd)/certs +certs-uninstall: export CAROOT = $(MKCERT_CAROOT) certs-uninstall: - $(call colorecho, "\nUninstall local CA...\n") +ifeq ($(MKCERT_BIN),no) + $(error ${MKCERT_ERROR}) +else + $(call step,Uninstall local CA...) @mkcert -uninstall || echo "No CA found..." +endif -PHONY += --certs-ca ---certs-install-ca: export CAROOT = $(shell pwd)/certs +PHONY += --certs-install-ca +--certs-install-ca: export CAROOT = $(MKCERT_CAROOT) --certs-install-ca: ifeq ($(MKCERT_BIN),no) $(error ${MKCERT_ERROR}) else - $(call colorecho, "\nCreate local CA...\n") - @mkcert -install -csr certs/stonehenge.csr + $(call step,Create local CA...) + @mkcert -install endif PHONY += --certs-create-certs ---certs-create-certs: export CAROOT = $(shell pwd)/certs +--certs-create-certs: export CAROOT = $(MKCERT_CAROOT) +--certs-create-certs: CERT := $(SH_CERTS_PATH)/$(SH_CERT_FILENAME) --certs-create-certs: ifeq ($(MKCERT_BIN),no) $(error ${MKCERT_ERROR}) else - $(call colorecho, "Create stonehenge.crt to ./certs folder...\n") - @test -f certs/stonehenge.crt && echo "- already exists" || mkcert -csr certs/stonehenge.csr -cert-file certs/stonehenge.crt + $(call step,Create $(SH_CERT_FILENAME).crt & $(SH_CERT_FILENAME).crt to ./$(SH_CERTS_PATH) folder...) + @test -f $(CERT).crt && echo "- already exists" || \ + mkcert -cert-file $(CERT).crt -key-file $(CERT).key "*.${DOCKER_DOMAIN}" endif - -PHONY += --certs-create-key-and-csr ---certs-create-key-and-csr: - $(call colorecho, "Create stonehenge.key & stonehenge.csr to ./certs folder...\n") - @test -f certs/stonehenge.key && test -f certs/stonehenge.csr && echo "Stonehenge .key and .csr already exist" || openssl req -new \ - -newkey rsa:2048 -nodes -keyout certs/stonehenge.key \ - -out certs/stonehenge.csr \ - -subj "/O=Stonehenge/OU=Stonehenge/CN=*.${DOCKER_DOMAIN}" - -define create_csr - openssl req -new \ - -newkey rsa:2048 -nodes -keyout certs/stonehenge.key \ - -out certs/stonehenge.csr \ - -subj "/O=Stonehenge/OU=Stonehenge mkcert/CN=*.docker.sh" -endef diff --git a/make/stonehenge.mk b/make/stonehenge.mk index 324bb4c0..61cefbd9 100644 --- a/make/stonehenge.mk +++ b/make/stonehenge.mk @@ -6,49 +6,55 @@ SHELL := /bin/bash PHONY += down down: ## Tear down Stonehenge - $(call colorecho, "\nTear down Stonehenge\n\n- Stop and remove the containers...\n") + $(call step,Tear down Stonehenge\n\n- Stop and remove the containers...) @docker-compose down -v --remove-orphans @docker network remove ${NETWORK_NAME} || docker network inspect ${NETWORK_NAME} - $(call colorecho, "\n- Remove resolver file...\n") + $(call step,Remove resolver file...) @. ./scripts/resolver.sh && remove - $(call colorecho, "\nDONE!\n") + $(call step,DONE!) PHONY += help help: ## Print this help - $(call colorecho, "\nAvailable make commands for Stonehenge:\n") + $(call step,Available make commands for Stonehenge:) @cat $(MAKEFILE_LIST) | grep -e "^[a-zA-Z_\-]*: *.*## *" | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' | sort PHONY += check-scripts check-scripts: @shellcheck scripts/*.sh install.sh .travis/*.sh && echo "All good" +PHONY += restart +restart: ## Restart Stonehenge + $(call step,Restarting Stonehenge containers...) + @docker-compose restart + $(call step,Restarted!) + PHONY += status status: ## Stonehenge status - $(call colorecho, "\nStonehenge status\n") + $(call step,Stonehenge status) @docker-compose ps PHONY += stop -stop: ## Stop Stonehenge containers - $(call colorecho, "\nStop Stonehenge containers\n") +stop: ## Stop Stonehenge + $(call step,Stopping Stonehenge containers...) @docker-compose stop - $(call colorecho, "\nSTOPPED!\n") + $(call step,STOPPED!) PHONY += up up: ## Launch Stonehenge - $(call colorecho, "\nStart Stonehenge on $(OS)") - $(call colorecho, "\n- Set resolver file...\n") + $(call step,Start Stonehenge on $(OS)) + $(call step,- Set resolver file...) @shopt -s xpg_echo && . ./scripts/resolver.sh && install - $(call colorecho, "\n- Create network ${NETWORK_NAME}...\n") + $(call step,- Create network ${NETWORK_NAME}...) @docker network inspect ${NETWORK_NAME} > /dev/null || docker network create ${NETWORK_NAME} && echo "Network created" - $(call colorecho, "\n- Start the containers...\n") + $(call step,- Start the containers...) @docker-compose -f docker-compose.yml $$(. ./scripts/os.sh && get_compose_files) up -d --force-recreate --remove-orphans - $(call colorecho, "\n- Adding your SSH key...\n") + $(call step,- Adding your SSH key...) @test -f ~/.ssh/id_rsa && docker run --rm -it --volume=$$HOME/.ssh/id_rsa:/$$HOME/.ssh/id_rsa --volumes-from=stonehenge-ssh-agent --name=stonehenge-ssh-agent-add-key amazeeio/ssh-agent ssh-add ~/.ssh/id_rsa || echo "No SSH key found" $(started) PHONY += update update: ## Update Stonehenge - $(call colorecho, "\nUpdate Stonehenge\n\n- Pull the latest code...\n") + $(call step,Update Stonehenge\n\n- Pull the latest code...) @git pull @make up @@ -61,14 +67,18 @@ include $(PROJECT_DIR)/make/ssl.mk # FUNCTIONS # -define colorecho - @tput -T xterm setaf 3 - @. ./.env && shopt -s xpg_echo && echo $1 - @tput -T xterm sgr0 -endef +# Colors +NO_COLOR=\033[0m +GREEN=\033[0;32m +RED=\033[0;31m +YELLOW=\033[0;33m define started - $(call colorecho, "\nSUCCESS! Open http://portainer.$$DOCKER_DOMAIN ...\n") + $(call step,SUCCESS! Open http://portainer.$$DOCKER_DOMAIN ...) +endef + +define step + @. ./.env && printf "\n${YELLOW}${1}${NO_COLOR}\n\n" endef ifeq ($(DOCKER_COMPOSE_BIN),no)