From 888ac26781af9446bddb1d7086550f54319d0f35 Mon Sep 17 00:00:00 2001 From: Benjamin Dweck Date: Thu, 22 Oct 2020 20:11:57 +0200 Subject: [PATCH] Refactored... still works --- broker-config/mosquitto.conf | 2 -- docker-compose.yml | 6 +++--- sub-config/torch-sub.conf | 8 ++++---- subscriber/Dockerfile | 9 +++------ subscriber/torch-subscriber-simple | 1 - subscriber/torchsub-conf/ca.crt | 23 --------------------- subscriber/torchsub-conf/subscriber.crt | 21 ------------------- subscriber/torchsub-conf/subscriber.key | 27 ------------------------- subscriber/torchsub-conf/torch-sub.conf | 20 ------------------ 9 files changed, 10 insertions(+), 107 deletions(-) delete mode 160000 subscriber/torch-subscriber-simple delete mode 100644 subscriber/torchsub-conf/ca.crt delete mode 100644 subscriber/torchsub-conf/subscriber.crt delete mode 100644 subscriber/torchsub-conf/subscriber.key delete mode 100644 subscriber/torchsub-conf/torch-sub.conf diff --git a/broker-config/mosquitto.conf b/broker-config/mosquitto.conf index af66f5c..9ac3d91 100644 --- a/broker-config/mosquitto.conf +++ b/broker-config/mosquitto.conf @@ -4,8 +4,6 @@ log_type all listener 1883 cafile /mosquitto/config/ca.crt -#keyfile /mosquitto/config/mqtt.example.com.key -#certfile /mosquitto/config/mqtt.example.com.crt require_certificate true use_identity_as_username true diff --git a/docker-compose.yml b/docker-compose.yml index d52b73d..de17256 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,11 +7,11 @@ services: context: ./tor args: - SVC_PORT=1883 - - SVC_HOST=mqtt.example.com + - SVC_HOST=broker networks: - tor_net - mqtt.example.com: + broker: image: eclipse-mosquitto volumes: - broker_data:/mosquitto/data @@ -29,7 +29,7 @@ services: - sub_data:/data - ./sub-config:/etc/torch ports: - - "9999:3434" + - "9999:8080" networks: - broker_net diff --git a/sub-config/torch-sub.conf b/sub-config/torch-sub.conf index 578bd4b..960c966 100644 --- a/sub-config/torch-sub.conf +++ b/sub-config/torch-sub.conf @@ -4,10 +4,10 @@ [mqtt] #Topic is required -BrokerHost=mqtt.example.com -BrokerPort=8883 +BrokerHost=broker +BrokerPort=1883 Topic=torch/+/wake -RequireCertificate=True +RequireCertificate=False CaFile=ca.crt KeyFile=subscriber.key CertFile=subscriber.crt @@ -18,4 +18,4 @@ Filename=torch_clients.json [web] #Port is optional and defaults to 8080 -Port=3434 +Port=8080 diff --git a/subscriber/Dockerfile b/subscriber/Dockerfile index 675dd75..44d53da 100644 --- a/subscriber/Dockerfile +++ b/subscriber/Dockerfile @@ -1,16 +1,13 @@ FROM python:3 -#WORKDIR /usr/src -#RUN git clone https://git.rudefox.io/bj/torch-subscriber-simple.git - -ADD torch-subscriber-simple /usr/src/torch-sub -WORKDIR /usr/src/torch-sub +WORKDIR /usr/src +RUN git clone https://git.rudefox.io/bj/torch-subscriber-simple.git +WORKDIR /usr/src/torch-subscriber-simple RUN pip3 install --no-cache-dir -r requirements.txt && \ python3 setup.py install WORKDIR /data - EXPOSE 8080 VOLUME [ "/etc/torch", "/data" ] ENTRYPOINT [ "torch-sub" ] diff --git a/subscriber/torch-subscriber-simple b/subscriber/torch-subscriber-simple deleted file mode 160000 index 1eee40a..0000000 --- a/subscriber/torch-subscriber-simple +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1eee40a30e88c070f54d456546b1daeaf7da0479 diff --git a/subscriber/torchsub-conf/ca.crt b/subscriber/torchsub-conf/ca.crt deleted file mode 100644 index 8e79f74..0000000 --- a/subscriber/torchsub-conf/ca.crt +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID6zCCAtOgAwIBAgIUQJye5MbZVMpOpu87TmmlN/KOBj0wDQYJKoZIhvcNAQEL -BQAwgYQxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJOWTERMA8GA1UEBwwITmV3IFlv -cmsxFTATBgNVBAoMDEV4YW1wbGUgSW5jLjEcMBoGA1UEAwwTY2EubXF0dC5leGFt -cGxlLmNvbTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AZXhhbXBsZS5jb20wHhcNMjAx -MDA2MTA1OTE4WhcNMzAxMDA0MTA1OTE4WjCBhDELMAkGA1UEBhMCVVMxCzAJBgNV -BAgMAk5ZMREwDwYDVQQHDAhOZXcgWW9yazEVMBMGA1UECgwMRXhhbXBsZSBJbmMu -MRwwGgYDVQQDDBNjYS5tcXR0LmV4YW1wbGUuY29tMSAwHgYJKoZIhvcNAQkBFhFh -ZG1pbkBleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -ALVndltaj3SX1zuJB0F5woIMUZCHopkgiO027/qE10IgM6SN4lFhR7wR0B/9PXrf -zn1xTC63w9xd3GbnlJvcWhWbh/m1t2Qx2mIvOmoELY8wlY6/V6NzjSgju7mZi0u6 -aitU+LXINNuGS+JhVpc54QQ8M9o0jKlnNGnEmPjv6uhbNXx3f8lw3eqSr1ZqmpGd -UQVYKsNYBVzSqsnh/sn/KnGYn/nmpsKRWeLhoslJ3zDjaM/Y4NYol11nWFIPYCk5 -7rzzxES/WdWLLnZ2W59YCT54YOGFqXE7oYgReD+Og2YwnGVQQpDcvb2HyIZL/2pa -oC6avMo/eC8HbSxwUKCnj1cCAwEAAaNTMFEwHQYDVR0OBBYEFEC8a9l0rpIdUqCS -i4NJwXlqUoLeMB8GA1UdIwQYMBaAFEC8a9l0rpIdUqCSi4NJwXlqUoLeMA8GA1Ud -EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAGzxJWZdVozskr5yie2uetpL -aAReCaHEdWudRN3wVW1Dpm2sE23x4VFiJ+Uow9k21GgtGUsAIFqRgb3/QO+ipODC -GRwZmVopkuOaHfCz+tO8xqjvGHCidhhhNFdR9uVkWHoPKsQsvap0SSk12KMtFBRo -3rmeQwPP4qEPFEwc2U0hCUMsIUvMSt3KrA/j+aMRzOXU7QIMFbcYEF1IaGJz1RMh -h1VCXaUlL2liVTWU4XgudB8rMOuETec7un9hzoBVOWHxXdRrGPaoN4+zWiLRCDXO -6wapOhkmTOXuZY/NcMMwTmdJKTEQBD6XIQamv91Ne2bT89LHpcp1LjbaCz+UAxg= ------END CERTIFICATE----- diff --git a/subscriber/torchsub-conf/subscriber.crt b/subscriber/torchsub-conf/subscriber.crt deleted file mode 100644 index 56cad15..0000000 --- a/subscriber/torchsub-conf/subscriber.crt +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDhzCCAm8CFFfe134gzLKm3ieNbeoxCvOhwsGyMA0GCSqGSIb3DQEBCwUAMIGE -MQswCQYDVQQGEwJVUzELMAkGA1UECAwCTlkxETAPBgNVBAcMCE5ldyBZb3JrMRUw -EwYDVQQKDAxFeGFtcGxlIEluYy4xHDAaBgNVBAMME2NhLm1xdHQuZXhhbXBsZS5j -b20xIDAeBgkqhkiG9w0BCQEWEWFkbWluQGV4YW1wbGUuY29tMB4XDTIwMTAwNjEx -MDYwM1oXDTMwMTAwNDExMDYwM1owezELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk5Z -MREwDwYDVQQHDAhOZXcgWW9yazEVMBMGA1UECgwMRXhhbXBsZSBJbmMuMRMwEQYD -VQQDDApzdWJzY3JpYmVyMSAwHgYJKoZIhvcNAQkBFhFhZG1pbkBleGFtcGxlLmNv -bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPuE9XvVpmvnFAj2ZCMv -UWpE4yea69f4XtZ64Bw+Kp2B9NF+1lU7OTpnP+1Xubx7GX2Fy4E7w+jKwrC4+R+Z -qtZh9UCLj7IEin6NoaKgLSXd75A9UFZbI9Vug7VSxm581J8qDzVNnflTwRBPvnC6 -1B1noXZRZGUbVjtC7ciIJ33bHktlTBbVvZwdZIB0upXe3iDeXE8I1izU+FB0EbCr -gmneo3mPW/5IPDGGJy1YI9HNa/h3gnZ5uomQ2/rhUB46Zr2+9/bGQHknIBMISWx6 -UR0FlkdCu4ezm377IjBATBXaEoqoWfyRSuLDgkAAiHbtp+IQpIL+soOczMjUhvhg -FyECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEACFy4ioFB5jeW+vMrTGfcwbq0qFW4 -9zupWVKG4H+l4N/bjiwTpKy8oP7STBS94BbA6fYE8Y+Jcibas1zX78HFIk/A9Dh1 -q9lysu7Biv4JbaXVPHxy9SzadUPym3bYAJtVRWsC1N2siI1NlalttDU1y+RnllUL -jixHf2/EghYgJydN7yoTWD7rbGD2GB4ADhohhMx5NL3h/7wge4qhvBIVEoa093hV -0rzctNrP0bDsZIei3RV6mat6teR4MUK7PQSmiwTPoFmbNB+T+sl/hT22B7utooQT -h5H39zpLiorQEUMF7qJff/7+KXs7YUGUFyAQyGnxhMhAQ7zWrkrR50sFwg== ------END CERTIFICATE----- diff --git a/subscriber/torchsub-conf/subscriber.key b/subscriber/torchsub-conf/subscriber.key deleted file mode 100644 index 5217b66..0000000 --- a/subscriber/torchsub-conf/subscriber.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpQIBAAKCAQEA+4T1e9Wma+cUCPZkIy9RakTjJ5rr1/he1nrgHD4qnYH00X7W -VTs5Omc/7Ve5vHsZfYXLgTvD6MrCsLj5H5mq1mH1QIuPsgSKfo2hoqAtJd3vkD1Q -Vlsj1W6DtVLGbnzUnyoPNU2d+VPBEE++cLrUHWehdlFkZRtWO0LtyIgnfdseS2VM -FtW9nB1kgHS6ld7eIN5cTwjWLNT4UHQRsKuCad6jeY9b/kg8MYYnLVgj0c1r+HeC -dnm6iZDb+uFQHjpmvb739sZAeScgEwhJbHpRHQWWR0K7h7ObfvsiMEBMFdoSiqhZ -/JFK4sOCQACIdu2n4hCkgv6yg5zMyNSG+GAXIQIDAQABAoIBAQDHKe6VQ4XHlbBo -tGpw7gwjAS96chNk7fhzD9OcqaFnHbv1k+E2lnHnjFCzqS6bUELMAYE28VNdaAko -lSA35J/BqMnidWCwzyW3toESXJHDlW0Yo2SVLRA/9oX2s/gLD2/yJQTr6W05PBf5 -yZt8eoRyUFgrb6H26eGrhYDytNXIsoL5Si7Q3/gc11jW5HLOqUhSE2oFQ9+xqq7B -HvD6a6nTF8upM2sTkyy9+n5RRuaqRfNTZmVzjNQOnnG+QyRyI0pdhipO77/+2JSl -8Db4F195wbZlxGsW7NwkJGCM0O9Fyaa2z7J/Je1KTuoTu+fCUhLwiojVLsQq10kO -ZZWm65+dAoGBAP6mi6K9H9LTzZ93XIOfmK9Q7S5SyOKQWLnSHMNyIsrtnZBWATEO -u16FNSOzdieOjY0rKptChUiqaTMavUEmk6aRLfkUqbrJygc8M+RH6xnb0Z1VXtM5 -bEvPgYu0mm550AvEFsnu77fr194GAIhabdvzMz7b7EvDzPO86iXwGRWPAoGBAPza -Km38aH+Ccpk2084H47v783fUXyS2ScbtccVZxqtn0sxEFVnwESYQjz9QovTNlqyN -Y6t6mr1M8nM8MmPwBXFa3D654xtew8zpiA/MvCDbqlXB87BeTSMJWPAERVw2XqAm -wYFg0yJXlRRgQDiiCZCxsVzppSwct/Aa6euGXpBPAoGBAPhSKDCWBIZujEFJACpK -Y3XykJdvmv10jVEHF41vq4X/mHq7o4XXO9e8Rkl+I2YHmPlkcrPcdmSZ6OQw2wTB -PZJcWFxgTfMb+6p6ho/Bof0hYpLuQP3xLS3wN/+oKkA5ASu4GBDqs1DC50pWyAYv -SJoH2p0dkJuBYEb+ncZJD+z5AoGAD6UUEQAYGyOgIZjB3DKixaPeOaDbTjM1N2jD -rFlUsJBY+6iOxaTT+s31fw5nNsxtsTmCXD7WyjWznquv1n0oaQ4dKIhp4+ymIsyk -TY32afYNgQbiJByBm1Rdu2QYQo9epXwgZvftuGdA4yTddGOaQeist7oBLUyNmP6h -UKBcw4MCgYEArWhvqZUvklgmTJi8bSyJaCuZrd7l4HxoajceQ7ujyl/N2zX+HAio -8uw46NUvsiyIk3OCI/59G5BrBtOIYq5KUTNhDdz6q0HMz1MSDRCH5Zt0Cokam+jX -j7QGOQnhTHkGv8Mabo6gmLPifPuYboFzivFGMJH8ur+38YOyGxbwvqI= ------END RSA PRIVATE KEY----- diff --git a/subscriber/torchsub-conf/torch-sub.conf b/subscriber/torchsub-conf/torch-sub.conf deleted file mode 100644 index b172582..0000000 --- a/subscriber/torchsub-conf/torch-sub.conf +++ /dev/null @@ -1,20 +0,0 @@ -############################################################################## -# Sample torch-sub.conf file -############################################################################## - -[mqtt] -#Topic is required -BrokerHost=broker -BrokerPort=8883 -Topic=torch/+/wake -CaFile=ca.crt -KeyFile=subscriber.key -CertFile=subscriber.crt - -[database] -#Filename is optional and defaults to 'clients.json' -Filename=torch_clients.json - -[web] -#Port is optional and defaults to 8080 -Port=3434