diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 9574b1f..e28e9ba 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,4 @@ +v1.0.305: Update SSL Certificates for OpenBuildsCAM integration v1.0.304: Inch mode DRO edit use 3 Decimal places as per #216, Updated SSL Certificates v1.0.303: Updated Interface Probe Macros v1.0.302: Pi Install Script updated to support 2021-03-04-raspios-buster-armhf diff --git a/Cert Update Procedure.txt b/Cert Update Procedure.txt new file mode 100644 index 0000000..be51ae8 --- /dev/null +++ b/Cert Update Procedure.txt @@ -0,0 +1,7 @@ +1) ssh to server +2) Run certbot -d mymachine.openbuilds.com --manual --preferred-challenges dns certonly +3) Update DNS record +4) Continue with CertBot +5) scp /etc/letsencrypt/archive/mymachine.openbuilds.com +- copy fullchain1.pem and privkey1.pem to CONTROL root directory +6) Build and Deploy \ No newline at end of file diff --git a/fullchain1.pem b/fullchain1.pem index 821a9fc..948bf73 100644 --- a/fullchain1.pem +++ b/fullchain1.pem @@ -1,32 +1,32 @@ -----BEGIN CERTIFICATE----- -MIIFNDCCBBygAwIBAgISBC1qhmMDv2Oxyo6+8IDP0PsTMA0GCSqGSIb3DQEBCwUA +MIIFNDCCBBygAwIBAgISA7xSior1O8o/eUSbjuhwbSKYMA0GCSqGSIb3DQEBCwUA MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD -EwJSMzAeFw0yMTA3MDgxMTUxNDBaFw0yMTEwMDYxMTUxMzlaMCMxITAfBgNVBAMT +EwJSMzAeFw0yMTEwMDgxNDU4NDdaFw0yMjAxMDYxNDU4NDZaMCMxITAfBgNVBAMT GG15bWFjaGluZS5vcGVuYnVpbGRzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP -ADCCAQoCggEBALfU7OsmOHO0H5kP1hym2fkQoPbfTuvkcHXpAQafYByKRuGx/KR+ -qftOYao5EDT53Xm3qGEjZQ2v1i92RtpcOQ3dpWO0p7ZdSsXNWYJNRnWrlL9yx9JI -L09EOQG2zK9n7MYim1ngXoHBYtbEXnMHMHP5jvtnQpEW5LTh0PKdTXpLOxjSTa9Q -u2fRBdMLphiFXT0p7+EmrwoqK6DhqO5qzcSZxFnbSaifdBtI5deLEM9WY/9K+0yl -OKN/Rr68mSSOQSx/YVWErwYuVeVHahPwewQJL3aNCZqkaA7Uu7fCkj1N3eun++e7 -fXUXy8FwRnqX92ccIcSZW8yQxdcmD703uK0CAwEAAaOCAlEwggJNMA4GA1UdDwEB +ADCCAQoCggEBALOMJdfDzwnnNO+gA9yKw8Qd0NYtHJVMBBgV97F4UNBr51gBvqTz +4fehoMB6SobVJEpaV+U6H9DCOnILu7gHaRjXxyUo/M9qktKYXU7mB0m2hPmAnbW/ +u5QiuAyxwxj8MboC4S5ipzdIkpXevt386tAZhIGft1kH2WlxYk8xmszpc1BScGqa +Ia96GK2K6xzu7PFRDweExi+HiHndOB5/aDADSQn1RJZ6+yzO+M8LnaMXJk9b8J0S +p47c2MzQz5AjIqUdBUSq05okDfj8263EPscocBQMMP8m0+ZUZGutimHdLS9+ydKm +Vey8SG1qg6rt0a1H8AJ6T6ReH4PTPcOaFtECAwEAAaOCAlEwggJNMA4GA1UdDwEB /wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/ -BAIwADAdBgNVHQ4EFgQU9ptomXfqfXmDTGi073rjmgeVddQwHwYDVR0jBBgwFoAU +BAIwADAdBgNVHQ4EFgQUg1cvyFUykpQYtXeYzBYmB7YykCIwHwYDVR0jBBgwFoAU FC6zF7dYVsuuUAlA5h+vnYsUwsYwVQYIKwYBBQUHAQEESTBHMCEGCCsGAQUFBzAB hhVodHRwOi8vcjMuby5sZW5jci5vcmcwIgYIKwYBBQUHMAKGFmh0dHA6Ly9yMy5p LmxlbmNyLm9yZy8wIwYDVR0RBBwwGoIYbXltYWNoaW5lLm9wZW5idWlsZHMuY29t MEwGA1UdIARFMEMwCAYGZ4EMAQIBMDcGCysGAQQBgt8TAQEBMCgwJgYIKwYBBQUH AgEWGmh0dHA6Ly9jcHMubGV0c2VuY3J5cHQub3JnMIIBAgYKKwYBBAHWeQIEAgSB -8wSB8ADuAHUAXNxDkv7mq0VEsV6a1FbmEDf71fpH3KFzlLJe5vbHDsoAAAF6hix+ -aAAABAMARjBEAiAvri05QJloQ/KKr/UOmAXbz11ptGuMCqgyXYaeNlA8QQIgIlnq -lUyJiROLyTedacww76LDm3KSqu/suJgQ12ygg0kAdQB9PvL4j/+IVWgkwsDKnlKJ -eSvFDngJfy5ql2iZfiLw1wAAAXqGLH6hAAAEAwBGMEQCIARIkAu+XJcYSKVwwpZD -VQzSd0+2p5KakUJ5+OKJtBNyAiBy8IYwhL6kwTp+Jbj2JjnFj0ZlNQ7P7yBqlQmh -OQPj7zANBgkqhkiG9w0BAQsFAAOCAQEAazVd/2sFJz7XXlkR8n8dUes5F73a+X/k -DkprILbZqmAPekhCb9MnPhIoTpa9DMlkqNYsG0RQZhVuzwcSmubAkKZAm5ICDxFG -ib7webTWg6SGpAH0ZqNagDiLEkh93d2ylLOGyeivjq7eUdH8jRu0diolghlf02Cb -LNNPfb717NDh9i0COULvl2F9lYO6Ni24zmz6C47lOPowRONQEmMsgLu+bikZ6NFl -Y2zNbNXy/mviDlvW5hNskwBwuCFiu+eCmVotFr8mkgGGw78xOgAsR+wsX5jNHwmp -YEDKmWi/gwUrH/psBNI9+D23ew6CfJ8A26gCaZyEzPQJz3JFzaSqJw== +8wSB8ADuAHUARqVV63X6kSAwtaKJafTzfREsQXS+/Um4havy/HD+bUcAAAF8YKDd +8AAABAMARjBEAiBDVYsIPSNUpaK4L0qEh0P2vc96bAFLL3cTjfDY13/9uwIgXUep +BIXCRwgEI7Q3Q8oG1IQ8iE7ZcKe4kBTWsHDSE70AdQBByMqx3yJGShDGoToJQode +TjGLGwPr60vHaPCQYpYG9gAAAXxgoN8uAAAEAwBGMEQCIFYtw6XaTBg9CEPR/dNH +6Wdj65W2woiYybzXjj4dObBxAiBu5lK2PZ1LEytU73Ns9hgX0MTJRSggr1dUBCy8 +HN5cyDANBgkqhkiG9w0BAQsFAAOCAQEAL2M2cXPLefu1kk8B+J4G3v1G5mm/dhq2 +7Td71T/XFmeo4TCsbP0JJLfaaTfITrA+Yc3inC1idlThyudwJoJvrGEEfP+ZMBzk +KnwYxv1WFSd7fixzHE+UHzZIbOTpld9jaGNrMjDe4jOUp+kKJZKgznZ+W+1jSxJw +2DSvAh5HKNPhM945XCw6DyDGfTFPGYe1ZwwZ4eb/2z6lk054taRtlL6DC5Q13lD7 +hH4XC8wp5DFv6hfsb2Im0Crr/ovYz4QsipWjIgZpqHb5/nkteTjyW69egws2qv9B +OPsHnl2EwTc87eNubvvUPHB9mn9zu4qKr/bvdGTc5nwAzQF3pAGr6A== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw diff --git a/package.json b/package.json index 59ff575..07f2157 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "OpenBuildsCONTROL", - "version": "1.0.304", + "version": "1.0.305", "license": "AGPL-3.0", "description": "OpenBuildsCONTROL CNC Machine Interface Software", "author": "github.com/openbuilds ", diff --git a/privkey1.pem b/privkey1.pem index 2adc782..99f87d2 100644 --- a/privkey1.pem +++ b/privkey1.pem @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC31OzrJjhztB+Z -D9Ycptn5EKD2307r5HB16QEGn2Acikbhsfykfqn7TmGqORA0+d15t6hhI2UNr9Yv -dkbaXDkN3aVjtKe2XUrFzVmCTUZ1q5S/csfSSC9PRDkBtsyvZ+zGIptZ4F6BwWLW -xF5zBzBz+Y77Z0KRFuS04dDynU16SzsY0k2vULtn0QXTC6YYhV09Ke/hJq8KKiug -4ajuas3EmcRZ20mon3QbSOXXixDPVmP/SvtMpTijf0a+vJkkjkEsf2FVhK8GLlXl -R2oT8HsECS92jQmapGgO1Lu3wpI9Td3rp/vnu311F8vBcEZ6l/dnHCHEmVvMkMXX -Jg+9N7itAgMBAAECggEABGmK6jX3oudO3tifdf6XOsAobOR9O3I3NM1L5gHLR8QV -4XLpMnWL1OlTtMc72Vmp9DLxSquT0FlJFciL+M+/2tJYFuWOJPVmRwsfu93o9AgT -QOkbXLO41vk3ORBPJ2KiLztDaUvWWNzwZ2E9NxuUESSLRwN6eIsJIEJPRpN5+ZZs -Oe4kOve/69J2zlcQcAwaDZYNBUR+YbTKDmpUrw6ZRh0sXVIvZcKO0sVa/46RYf1N -OTbA3shw17E+naNDYnxZP35/i0ukLPhEaN6a5+vsSWdCrjLu8uSq9ZL+qQv7CPMR -prm9kJioD95ZpEVxpTWDRSddn/M6/qUCklo5mmTTgQKBgQDqOJdu+f/m5IthxDw+ -EhJo6xiZc9ONqjaW4IYdLIKnh8HZ9GvWGjnEF3ayM+ZU7yvB7GwH5DOI4/EMY8Ti -2h4PRyEkMXCfKdcC+DOGO9MDOLi0aP5AikDvHPK46q12a3WQWufIie06TGNt0PvD -wSQrerAR+F8+W1whKs8M8NoZIQKBgQDI7N1DwYZkSZjdYF4CILnlPGfR5lMGU44Q -5L/xvH1/JNjQcGmjaZ+xbRbBZ9LNCTrfggfJVQbSt5Ebc+Mzzx6zywtlDB/doqgl -qQwdXuWcrzuisDRGPoIXvvNi+ji8n91pwQXPD1NxyCD/m6Z8wmCtYaijrsshh/1G -OKkK1bwyDQKBgQDnxPY8z9AlV5SBOyDtvw5OmgzulEoMThnUtPqhVdE4HEN7/LzU -0YDGBP3kmyzacQ1YyS2hpXRFimGWBAfo/zNtpNIrsWyjY1CrVJYPx5UoA/HqPFcT -4Hse4gNhboAVxYJBRWNE8w83eC2PlpP7glzbVX1zWtZMqzUAcQ8P3CnFYQKBgQCg -zkmL57/KVci9LFows8Zzu/OPXxoFjyu9Q4aHTwbVkkTgFYfGXEuNsbQrmA9zP7bZ -mPToYl9yl63P3eDx3wtAc/mrppd+R6bxdSkX/JIh43EEFKfRrEdr/8xE4+QyunN3 -Jx+iBy8OelBGomkNonfDa8yPK96w+GhxIfnQjRzwpQKBgFYoqwdtHeX/zInPSNPM -den4j2gnHnsREG+b2DkoxW+35Qde4WWEfINPrhopq0eQ+ziF29tUDZncVlCidfvn -ZaNXFDOWeRBtvtKH1puJxdZpSTOAC2Amfnib+CCt/q0pKC9wjAlb1YtMeSiwvpa8 -cYwXysLENs0PDeLo5GVmJ0P5 +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCzjCXXw88J5zTv +oAPcisPEHdDWLRyVTAQYFfexeFDQa+dYAb6k8+H3oaDAekqG1SRKWlflOh/Qwjpy +C7u4B2kY18clKPzPapLSmF1O5gdJtoT5gJ21v7uUIrgMscMY/DG6AuEuYqc3SJKV +3r7d/OrQGYSBn7dZB9lpcWJPMZrM6XNQUnBqmiGvehitiusc7uzxUQ8HhMYvh4h5 +3Tgef2gwA0kJ9USWevsszvjPC52jFyZPW/CdEqeO3NjM0M+QIyKlHQVEqtOaJA34 +/NutxD7HKHAUDDD/JtPmVGRrrYph3S0vfsnSplXsvEhtaoOq7dGtR/ACek+kXh+D +0z3DmhbRAgMBAAECggEAcm3XkHPS99TLAA1TaLNnoQ3/kwCdPul7kn4tpoWvu6WJ +g6VZA3gLg+8WrJVD+jrNLjX13rn0nO+soBKqSNcwPA0Jdr1woiCiAmXo0ef4rRoO +FZXK7ZKM0hRuiGiilsHkT1CWgyGMwMcX5TxZGNGgNZCNyq8oAy3lejYxGZfbuMve +ypxrFnNOjfZSUEbqaR7aPzNTKsG+lTNFTN4eDxreEPKEErC9sSVvnbIbHt0tmj+w +v1Qi5VVvIxcBsKXioLolzFAfY9Gw1gvGMweOllsB34Cf3sOGLhb0JLpoCmPjbM8N +MAeXPk2409MJX2O0Xb+yELGlZGDaw4oCh6O3+cyQAQKBgQDZzheaaaOX/aQMkwsK +PR8BEQLBLGO32g0XItO2hgRuTcAgEpVkW4akwBXB4KznoGe8K24SuDHpfa03WT+9 +U3pjnMV/LjRo3bTBWiFnYoV/aVOB/vikZnEQvZbyD5yX990zpZz7/5Bz1KTiqFF2 +ETTon2SHqeo8pjr5CjyCbSKiYQKBgQDTCI9VX46bVrQQ3kefEnSNgAU7FpNkZJGr +Py+vT6k7OJr+9l1GWpxFJV7LDZocfhF2NVraWsy1ref26uo94nVq//hUGWXdRzfd +w8rrmnjmItR+GGPJF9IKYZPvj1STlJgcdJ8fuN8ecaaKlCHOlaCwd9NJnVFEu+nw +3z6SwPyqcQKBgQCwkKoBu3GrXSsIJovkmPfxXWDmSJ3uBQ5nmwwWAz7ETLNbTLVe +zfOwyybYLNL+UsLFgE+TTU7pAcDSBb/uMyYcapKQL1y9Rj2qIO7DaNLgHvpbf98B +Jyqxb4BWauF/MKhZngBNKThpLhEczWZ8WCaUDeLpN41z7S4RhYLYGLDjAQKBgHLf +Y/Za76uLBLVx6ZajWyJzH2XMoiqxu8F1waUyPbJo26YRwTA8vne9Id5x5wO/dA3e +eTgG2QvEQFJeCWfqT3QRJcHRmWtcCwMCQwEAsvLC3txMtnSOLN1NxFNQt/8lka9b +pAqGfZ16y+b/P2/ObwvgDfkyUzyQ9YUSYGNN/bthAoGAHBljK5fWFh8x+hKxQaj3 +jllG5uNwgddrENV+PO/uLT918BrYFmJZ3pEbHQu5LGKOz/wTkfj4no7Z2bAm5Q4V ++9peYPAlVKWEozYd990FKG0zCKwTOXjGzyc+wR1tICd+NQaH28xy1uYRGvev1TMr +0fTVhmTIqAjsq1u/DgZg2Fs= -----END PRIVATE KEY-----