diff --git a/certificate/server.crt b/certificate/server.crt new file mode 100644 index 00000000..9b2116bc --- /dev/null +++ b/certificate/server.crt @@ -0,0 +1,17 @@ +-----BEGIN CERTIFICATE----- +MIICqTCCAhICCQDu1PpJevN60TANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMC +RlIxDTALBgNVBAgTBEdhcmQxEDAOBgNVBAcTB1ZlcmdlemUxDjAMBgNVBAoTBU5h +ZGFsMQ4wDAYDVQQLEwVOYWRhbDEdMBsGA1UEAxMUc2VydmV1ci5uYWRhbC1mci5j +b20xKTAnBgkqhkiG9w0BCQEWGmplYW4uYmFwdGlzdGVAbmFkYWwtZnIuY29tMB4X +DTE1MDMwOTE1MjI0NloXDTI1MDMwNjE1MjI0NlowgZgxCzAJBgNVBAYTAkZSMQ0w +CwYDVQQIEwRHYXJkMRAwDgYDVQQHEwdWZXJnZXplMQ4wDAYDVQQKEwVOYWRhbDEO +MAwGA1UECxMFTmFkYWwxHTAbBgNVBAMTFHNlcnZldXIubmFkYWwtZnIuY29tMSkw +JwYJKoZIhvcNAQkBFhpqZWFuLmJhcHRpc3RlQG5hZGFsLWZyLmNvbTCBnzANBgkq +hkiG9w0BAQEFAAOBjQAwgYkCgYEA556iQlqKwQyqZc+21hQKiOjiLZX6b6IAH4AA +DrLON8yeiVNn1boy9WwEY3kbUd4dRVgtaYo7Bkh4CfsLtVTRVDIIvghXuHQqEazL +DFKiB+ZwJ4h9QzfT0rKof4mBtQWj/2FfoXajVwIjAharWzhN+6a380jdxwPpmrQC +K7M7SykCAwEAATANBgkqhkiG9w0BAQsFAAOBgQBPDbDQlV7IMg2+GgoJPFzTRYkU +e/JNEPI21lp6b5YKHErvyfHGuJCg744TUvRbLinF82pwngpNvWJesimF3gXyXGQq +jvwMYZoUEAssX/NUBCmwLhORjDdGmFALh004knoeaoG+S0ktkvuuTnYx9x/5wXJK +7adJ3OzssCNIg2BWuA== +-----END CERTIFICATE----- diff --git a/certificate/server.key b/certificate/server.key new file mode 100644 index 00000000..a86d7cfe --- /dev/null +++ b/certificate/server.key @@ -0,0 +1,15 @@ +-----BEGIN RSA PRIVATE KEY----- +MIICXwIBAAKBgQDnnqJCWorBDKplz7bWFAqI6OItlfpvogAfgAAOss43zJ6JU2fV +ujL1bARjeRtR3h1FWC1pijsGSHgJ+wu1VNFUMgi+CFe4dCoRrMsMUqIH5nAniH1D +N9PSsqh/iYG1BaP/YV+hdqNXAiMCFqtbOE37prfzSN3HA+matAIrsztLKQIDAQAB +AoGBANIsm5ZUbKZC5Pif5IwcAXc8w8iT2H2l5jCvSN4NmJz/mziHq6hAXu9exhix +k33VbIA5RHQJkAfiiLKd0IEJ5yuiKRLoVUXOcvB4p9Cf2EmsaOKgP3g5mJcFoKlV +A/P5uDFOJGyUHTPwslNlKca8cbGcliK2NYjFKji6QPBJY11FAkEA/kBE1K7CLfoC +LFgi0BfmoegHzokvWB+5oum6FMOAr6SgQvKqysh6iGMFpu73dvVin4xOBS3+YyM6 +jz611HRYFwJBAOk2gvNJKccOZcv6oaxpkh9oyzBY0NBe6IQH+Ve9lae20sGbhDfe +SZ+Q70MEa/WNar8MsFAw4R1kv4+a2eyoPr8CQQCzCAZvzO8m+Nj26Mj6xxm8AGse +4DLaVtyc/v/tBw1ioQXInp/tUuYVi8S7G6JdvcTInD+EHjL3FCN0IrBe/d3ZAkEA +g+YqxgJZOJXyCR3llqfW1yDj2qJA57jl9Na1tWQqYkLKjGmyrA5ywWati8/SZ3zm +JMu+ZHxgtckndsbz/h9h7QJBAJST5aahx9iscfJq5mhFafMb5qj50oiVpDUgoQEG +/dGYEQ+ytlXX2rs8sgcrIX+SllDd2+y5SHc7q/8pBFxFXZE= +-----END RSA PRIVATE KEY----- diff --git a/certificate/server.key.orig b/certificate/server.key.orig new file mode 100644 index 00000000..b8dd07f1 --- /dev/null +++ b/certificate/server.key.orig @@ -0,0 +1,18 @@ +-----BEGIN RSA PRIVATE KEY----- +Proc-Type: 4,ENCRYPTED +DEK-Info: DES-EDE3-CBC,25C83D9F0DB6ABD9 + +pz5aceHTxsqJm9sHKk5Qb1TVqdg7OQhWqUrHuw/GVTUqV4NKiqItInrMVHWPJbMZ +GAJnesf+l51vXRmGce0F9M6W00NJmtEf+q9X7X3RH9SndNvYv1fvQPZNCQfpPqfu +bczcGy3Nl9B4SI0mXdIQQhrAFZ11ey/qOmzP9kxNqXEnyeQb6fdi6J4Qm0rKWNif +9ZJP/UMkHu2tuKs+U5mRsJ9xFTHRksM+yKvRA1p6l5zLjv5LYa2rXoRibqcWB5o0 +qo5URp4U/tbLXzO4i/OetF5znmXYAhQoKPNzCn+uTlzDYN3X6dPMxD2uq+xzzrbA +QZ28AU5vGb3HqCfLPc2rmitE7j61kIC/PIcF0wjLosjVOs+cvSmwCoRaGLMauX7w +qva00jE1O7QxFw+Bw+KfzSpmvGkFNk0L8jjuSvuqStxGF5EhIDejR/fqE3ezvTSC +HO4xHFDrZADe4AA5hPzrxW1IKDyetz1++9a7TjWAV7puPlWdiohRD+Rw2hWyY1uM +Rr/woPRd4nclECYVLCA2eneFdcZ2U5HlMVZyfsAbqBtE/FKFp0ecwGyb9drBh42u +591uSSXLt/dO6ESqPBWW6EYVj5Jgrouv2SK/Z7T6gX5T3gliYTofqWYns17HFJ3J +zxfXoA5Mc3caD354/AC5m2WKV9qdXY9IOYW0NQryvV+J7NAKEM77cUBKk2b5V7jl +rQ8Pzjs6qOPdN0t5bR4eSL/lUmG3vD+uWaSVzQZvWo+dbV+3wnovgwNvF2yJzZ3P +85lTji8ezUEWIpZgCQKC0l2FFPnwikjH33TMx1U1VhID9ESYKgZoiw== +-----END RSA PRIVATE KEY----- diff --git a/certificate/ssl.csr b/certificate/ssl.csr new file mode 100644 index 00000000..5b21150d --- /dev/null +++ b/certificate/ssl.csr @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIC3jCCAcYCAQAwgZgxCzAJBgNVBAYTAkZSMQ0wCwYDVQQIEwRHYXJkMRAwDgYD +VQQHEwdWZXJnZXplMQ4wDAYDVQQKEwVOYWRhbDEOMAwGA1UECxMFTmFkYWwxHTAb +BgNVBAMTFHNlcnZldXIubmFkYWwtZnIuY29tMSkwJwYJKoZIhvcNAQkBFhpqZWFu +LmJhcHRpc3RlQG5hZGFsLWZyLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBALhRWN2Vf82vKbbNamXCmBkXti79FT1Cc/s098oVR1bRlMpOfTCc/5Ox +A8xLByiaNYbA/3Cp3W3ILxA2TkC4YYXLWUo7TWNTD0Z535oTjRwuhFGnE2yJpA8c +qfje6CEaN7i/VbAs1vFxQW9NZT0h61K2y6YPb8iBwJHenS8nxO7C+hXKzyJuqoQU +3EfCm1ahZUUD29+EZS4vQHT2kZNj9xJIq8pfrve13bQE1gND9eu/0BN9AxyM5TOG +uK4CQ5NEpLmctBEUzsV1PxIUK1h/wvSa+dh+Pi8VihomGHlD63MIoP24hZDJE5Zv +x9DobYTD4poou+J/U9Lir6YNoZcVTxcCAwEAAaAAMA0GCSqGSIb3DQEBBQUAA4IB +AQBm7m+wsCVcQsrfM9MxSyqJMswgHGTSFP3+7vA7qbbMI1bE7/5DlUc9CzFrCco3 +O1UOlXosQoWN2SI3t2bXB2rpGk2El0ShHl/bLzjvFdbXwDowsU2+QyErAJTdhYtH +KGMbvNGSsUhZ2x5VOJpUHuNLxHBy/CkzHeFO7xiLWG5g5pXwZoHnd/sG2lTCSvMO +DbVAz7edAEFLlf5qLSXXP+Jdy5JRXnvhK+rdBF8WQR+nwMeIpSth8j89easxsrb4 +t2eQ0fszxA+hZorKVmxFJwUNBM1JrtFNsU3Dbf44GCAHPmc2wap8VSUisdwyUSVC +e8LR7ralxtOhwuCBnY/Gkw0U +-----END CERTIFICATE REQUEST----- diff --git a/certificate/ssl_cert.pem b/certificate/ssl_cert.pem new file mode 100644 index 00000000..ba27b633 --- /dev/null +++ b/certificate/ssl_cert.pem @@ -0,0 +1,32 @@ +-----BEGIN CERTIFICATE----- +MIICqTCCAhICCQDu1PpJevN60TANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMC +RlIxDTALBgNVBAgTBEdhcmQxEDAOBgNVBAcTB1ZlcmdlemUxDjAMBgNVBAoTBU5h +ZGFsMQ4wDAYDVQQLEwVOYWRhbDEdMBsGA1UEAxMUc2VydmV1ci5uYWRhbC1mci5j +b20xKTAnBgkqhkiG9w0BCQEWGmplYW4uYmFwdGlzdGVAbmFkYWwtZnIuY29tMB4X +DTE1MDMwOTE1MjI0NloXDTI1MDMwNjE1MjI0NlowgZgxCzAJBgNVBAYTAkZSMQ0w +CwYDVQQIEwRHYXJkMRAwDgYDVQQHEwdWZXJnZXplMQ4wDAYDVQQKEwVOYWRhbDEO +MAwGA1UECxMFTmFkYWwxHTAbBgNVBAMTFHNlcnZldXIubmFkYWwtZnIuY29tMSkw +JwYJKoZIhvcNAQkBFhpqZWFuLmJhcHRpc3RlQG5hZGFsLWZyLmNvbTCBnzANBgkq +hkiG9w0BAQEFAAOBjQAwgYkCgYEA556iQlqKwQyqZc+21hQKiOjiLZX6b6IAH4AA +DrLON8yeiVNn1boy9WwEY3kbUd4dRVgtaYo7Bkh4CfsLtVTRVDIIvghXuHQqEazL +DFKiB+ZwJ4h9QzfT0rKof4mBtQWj/2FfoXajVwIjAharWzhN+6a380jdxwPpmrQC +K7M7SykCAwEAATANBgkqhkiG9w0BAQsFAAOBgQBPDbDQlV7IMg2+GgoJPFzTRYkU +e/JNEPI21lp6b5YKHErvyfHGuJCg744TUvRbLinF82pwngpNvWJesimF3gXyXGQq +jvwMYZoUEAssX/NUBCmwLhORjDdGmFALh004knoeaoG+S0ktkvuuTnYx9x/5wXJK +7adJ3OzssCNIg2BWuA== +-----END CERTIFICATE----- +-----BEGIN RSA PRIVATE KEY----- +MIICXwIBAAKBgQDnnqJCWorBDKplz7bWFAqI6OItlfpvogAfgAAOss43zJ6JU2fV +ujL1bARjeRtR3h1FWC1pijsGSHgJ+wu1VNFUMgi+CFe4dCoRrMsMUqIH5nAniH1D +N9PSsqh/iYG1BaP/YV+hdqNXAiMCFqtbOE37prfzSN3HA+matAIrsztLKQIDAQAB +AoGBANIsm5ZUbKZC5Pif5IwcAXc8w8iT2H2l5jCvSN4NmJz/mziHq6hAXu9exhix +k33VbIA5RHQJkAfiiLKd0IEJ5yuiKRLoVUXOcvB4p9Cf2EmsaOKgP3g5mJcFoKlV +A/P5uDFOJGyUHTPwslNlKca8cbGcliK2NYjFKji6QPBJY11FAkEA/kBE1K7CLfoC +LFgi0BfmoegHzokvWB+5oum6FMOAr6SgQvKqysh6iGMFpu73dvVin4xOBS3+YyM6 +jz611HRYFwJBAOk2gvNJKccOZcv6oaxpkh9oyzBY0NBe6IQH+Ve9lae20sGbhDfe +SZ+Q70MEa/WNar8MsFAw4R1kv4+a2eyoPr8CQQCzCAZvzO8m+Nj26Mj6xxm8AGse +4DLaVtyc/v/tBw1ioQXInp/tUuYVi8S7G6JdvcTInD+EHjL3FCN0IrBe/d3ZAkEA +g+YqxgJZOJXyCR3llqfW1yDj2qJA57jl9Na1tWQqYkLKjGmyrA5ywWati8/SZ3zm +JMu+ZHxgtckndsbz/h9h7QJBAJST5aahx9iscfJq5mhFafMb5qj50oiVpDUgoQEG +/dGYEQ+ytlXX2rs8sgcrIX+SllDd2+y5SHc7q/8pBFxFXZE= +-----END RSA PRIVATE KEY----- diff --git a/firmware/board/raspberrypi/ovl/etc/init.d/S60ubusd b/firmware/board/raspberrypi/ovl/etc/init.d/S60ubusd index 0d864bcc..b01b358b 100755 --- a/firmware/board/raspberrypi/ovl/etc/init.d/S60ubusd +++ b/firmware/board/raspberrypi/ovl/etc/init.d/S60ubusd @@ -2,6 +2,7 @@ NAME=ubusd DAEMON=/opt/Domo/bin/$NAME + export LD_LIBRARY_PATH=/opt/Domo/lib/ # Gracefully exit if the package has been removed. diff --git a/firmware/board/raspberrypi/ovl/etc/init.d/S61domod b/firmware/board/raspberrypi/ovl/etc/init.d/S61domod index aa9ef2f2..4601b5b1 100755 --- a/firmware/board/raspberrypi/ovl/etc/init.d/S61domod +++ b/firmware/board/raspberrypi/ovl/etc/init.d/S61domod @@ -2,6 +2,7 @@ NAME=domod DAEMON=/opt/Domo/bin/$NAME + export LD_LIBRARY_PATH=/opt/Domo/lib/ export DOMO_WRITE_PATH=/home/rpi/domo diff --git a/firmware/board/raspberrypi/ovl/etc/init.d/S62sprinklersd b/firmware/board/raspberrypi/ovl/etc/init.d/S62sprinklersd index fd37fea0..e4517a3e 100755 --- a/firmware/board/raspberrypi/ovl/etc/init.d/S62sprinklersd +++ b/firmware/board/raspberrypi/ovl/etc/init.d/S62sprinklersd @@ -2,6 +2,7 @@ NAME=sprinklersd DAEMON=/opt/Domo/bin/$NAME + export LD_LIBRARY_PATH=/opt/Domo/lib/ # Gracefully exit if the package has been removed. diff --git a/firmware/board/raspberrypi/ovl/etc/init.d/S63chacond b/firmware/board/raspberrypi/ovl/etc/init.d/S63chacond new file mode 100755 index 00000000..30f26d0b --- /dev/null +++ b/firmware/board/raspberrypi/ovl/etc/init.d/S63chacond @@ -0,0 +1,34 @@ +#! /bin/sh + +NAME=chacond +DAEMON=/opt/Domo/bin/$NAME +PIN_NUMBER=17 + +export LD_LIBRARY_PATH=/opt/Domo/lib/ + +# Gracefully exit if the package has been removed. +test -x $DAEMON || exit 0 + +case "$1" in + start) + printf "Starting $NAME: " + start-stop-daemon -S -q -b -x $DAEMON $PIN_NUMBER -- + [ $? = 0 ] && echo "OK" || echo "FAIL" + ;; + stop) + printf "Stopping $NAME: " + start-stop-daemon -K -q -n $NAME + ;; + restart|reload) + echo "Restarting $NAME: " + $0 stop + sleep 1 + $0 start + ;; + *) + echo "Usage: $0 {start|stop|restart|reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/firmware/board/raspberrypi/ovl/etc/init.d/S65restd b/firmware/board/raspberrypi/ovl/etc/init.d/S65restd index a3b92013..68fdb85c 100755 --- a/firmware/board/raspberrypi/ovl/etc/init.d/S65restd +++ b/firmware/board/raspberrypi/ovl/etc/init.d/S65restd @@ -2,6 +2,7 @@ NAME=restd DAEMON=/opt/Domo/bin/$NAME + export LD_LIBRARY_PATH=/opt/Domo/lib/ # Gracefully exit if the package has been removed. diff --git a/firmware/board/raspberrypi/ovl/etc/profile.d/custom.sh b/firmware/board/raspberrypi/ovl/etc/profile.d/custom.sh index dd2917e6..93797b72 100644 --- a/firmware/board/raspberrypi/ovl/etc/profile.d/custom.sh +++ b/firmware/board/raspberrypi/ovl/etc/profile.d/custom.sh @@ -1,6 +1,10 @@ # Acces aux scripts personnels et code metier. -PATH=$PATH:/usr/local/bin -LD_LIBRARY_PATH=/opt/Domo/lib +PATH=$PATH:/usr/local/bin:/opt/Domo/bin/ + +# Access to the custom libraries +export LD_LIBRARY_PATH=/opt/Domo/lib/ + +export DOMO_WRITE_PATH=/home/rpi/domo # Prompt indiquant nom d'hote et repertoire courant. PS1='\h[\W]\$ ' diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index de36759a..c0f49505 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,6 +7,6 @@ add_subdirectory (domod/builders/cmake) add_subdirectory (chacond/builders/cmake) add_subdirectory (sprinklersd/builders/cmake) #add_subdirectory (rf_listenerd/builders/cmake) -#add_subdirectory (restd/builders/cmake) +add_subdirectory (restd/builders/cmake) #add_subdirectory (ui/builders/cmake) # add_subdirectory (board/builders/cmake)