diff --git a/os/routers/glmain/config.yaml b/os/routers/glmain/config.yaml index 1699a83..f702ca8 100644 --- a/os/routers/glmain/config.yaml +++ b/os/routers/glmain/config.yaml @@ -55,6 +55,20 @@ iot: mac: '64:B7:08:28:52:50' - name: 'epl-livingroom' mac: '64:B7:08:28:56:F4' + - name: 'shelly-basement-living' + mac: 'B8:D6:1A:8A:5F:F4' + - name: 'shelly-basement-shared' + mac: 'B8:D6:1A:8C:4C:DC' + - name: 'shelly-laundry-light' + mac: 'C8:2B:96:1D:DA:B4' apl: - name: 'hp-print' - mac: '48:9E:BD:CB:07:E3' \ No newline at end of file + mac: '48:9E:BD:CB:07:E3' + - name: 'gm-eddie' + mac: '20:DF:B9:71:55:9C' + - name: 'myq-garage' + mac: 'CC:6A:10:8B:7D:D3' + - name: 'pod-korie' + mac: '04:99:B9:86:2D:AE' + - name: 'pod-livingroom' + mac: '04:99:B9:88:ED:3B' \ No newline at end of file diff --git a/os/routers/glmain/output/etc/dnsmasq.conf b/os/routers/glmain/output/etc/dnsmasq.conf index edf142c..1b85bdd 100644 --- a/os/routers/glmain/output/etc/dnsmasq.conf +++ b/os/routers/glmain/output/etc/dnsmasq.conf @@ -38,3 +38,33 @@ dhcp-host=34:60:F9:D7:51:3F,CamLivingroom,10.0.13.4,infinite address=/livingroom.cam.internal/10.0.13.4 dhcp-host=60:74:F4:4D:B8:C5,IotKorie-lamp,10.0.14.1,infinite address=/korie-lamp.iot.internal/10.0.14.1 +dhcp-host=DC:4F:22:24:0C:E4,IotOffice-strip,10.0.14.2,infinite +address=/office-strip.iot.internal/10.0.14.2 +dhcp-host=44:61:32:FC:10:EC,IotEcobee,10.0.14.3,infinite +address=/ecobee.iot.internal/10.0.14.3 +dhcp-host=30:30:F9:DC:A8:18,IotApollo-eddie,10.0.14.4,infinite +address=/apollo-eddie.iot.internal/10.0.14.4 +dhcp-host=30:30:F9:DA:C7:A4,IotApollo-office,10.0.14.5,infinite +address=/apollo-office.iot.internal/10.0.14.5 +dhcp-host=30:30:F9:DC:BE:7C,IotApollo-laundry,10.0.14.6,infinite +address=/apollo-laundry.iot.internal/10.0.14.6 +dhcp-host=64:B7:08:28:52:50,IotEpl-kitchen,10.0.14.7,infinite +address=/epl-kitchen.iot.internal/10.0.14.7 +dhcp-host=64:B7:08:28:56:F4,IotEpl-livingroom,10.0.14.8,infinite +address=/epl-livingroom.iot.internal/10.0.14.8 +dhcp-host=B8:D6:1A:8A:5F:F4,IotShelly-basement-living,10.0.14.9,infinite +address=/shelly-basement-living.iot.internal/10.0.14.9 +dhcp-host=B8:D6:1A:8C:4C:DC,IotShelly-basement-shared,10.0.14.10,infinite +address=/shelly-basement-shared.iot.internal/10.0.14.10 +dhcp-host=C8:2B:96:1D:DA:B4,IotShelly-laundry-light,10.0.14.11,infinite +address=/shelly-laundry-light.iot.internal/10.0.14.11 +dhcp-host=48:9E:BD:CB:07:E3,AplHp-print,10.0.15.1,infinite +address=/hp-print.apl.internal/10.0.15.1 +dhcp-host=20:DF:B9:71:55:9C,AplGm-eddie,10.0.15.2,infinite +address=/gm-eddie.apl.internal/10.0.15.2 +dhcp-host=CC:6A:10:8B:7D:D3,AplMyq-garage,10.0.15.3,infinite +address=/myq-garage.apl.internal/10.0.15.3 +dhcp-host=04:99:B9:86:2D:AE,AplPod-korie,10.0.15.4,infinite +address=/pod-korie.apl.internal/10.0.15.4 +dhcp-host=04:99:B9:88:ED:3B,AplPod-livingroom,10.0.15.5,infinite +address=/pod-livingroom.apl.internal/10.0.15.5 diff --git a/os/routers/glmain/output/etc/ethers b/os/routers/glmain/output/etc/ethers index 562885e..820094d 100644 --- a/os/routers/glmain/output/etc/ethers +++ b/os/routers/glmain/output/etc/ethers @@ -53,6 +53,20 @@ DC:4F:22:24:0C:E4 office-strip.iot.internal 64:B7:08:28:52:50 epl-kitchen.iot.internal 64:B7:08:28:56:F4 10.0.14.8 64:B7:08:28:56:F4 epl-livingroom.iot.internal +B8:D6:1A:8A:5F:F4 10.0.14.9 +B8:D6:1A:8A:5F:F4 shelly-basement-living.iot.internal +B8:D6:1A:8C:4C:DC 10.0.14.10 +B8:D6:1A:8C:4C:DC shelly-basement-shared.iot.internal +C8:2B:96:1D:DA:B4 10.0.14.11 +C8:2B:96:1D:DA:B4 shelly-laundry-light.iot.internal #Apl 48:9E:BD:CB:07:E3 10.0.15.1 48:9E:BD:CB:07:E3 hp-print.apl.internal +20:DF:B9:71:55:9C 10.0.15.2 +20:DF:B9:71:55:9C gm-eddie.apl.internal +CC:6A:10:8B:7D:D3 10.0.15.3 +CC:6A:10:8B:7D:D3 myq-garage.apl.internal +04:99:B9:86:2D:AE 10.0.15.4 +04:99:B9:86:2D:AE pod-korie.apl.internal +04:99:B9:88:ED:3B 10.0.15.5 +04:99:B9:88:ED:3B pod-livingroom.apl.internal diff --git a/os/routers/glmain/output/summary.yaml b/os/routers/glmain/output/summary.yaml index ae41619..5e6eb7d 100644 --- a/os/routers/glmain/output/summary.yaml +++ b/os/routers/glmain/output/summary.yaml @@ -77,7 +77,28 @@ Iot: Epl-livingroom: ip: "10.0.14.8" host: "epl-livingroom.iot.internal" + Shelly-basement-living: + ip: "10.0.14.9" + host: "shelly-basement-living.iot.internal" + Shelly-basement-shared: + ip: "10.0.14.10" + host: "shelly-basement-shared.iot.internal" + Shelly-laundry-light: + ip: "10.0.14.11" + host: "shelly-laundry-light.iot.internal" Apl: Hp-print: ip: "10.0.15.1" - host: "hp-print.apl.internal" \ No newline at end of file + host: "hp-print.apl.internal" + Gm-eddie: + ip: "10.0.15.2" + host: "gm-eddie.apl.internal" + Myq-garage: + ip: "10.0.15.3" + host: "myq-garage.apl.internal" + Pod-korie: + ip: "10.0.15.4" + host: "pod-korie.apl.internal" + Pod-livingroom: + ip: "10.0.15.5" + host: "pod-livingroom.apl.internal" \ No newline at end of file diff --git a/os/routers/glmain/push.sh b/os/routers/glmain/push.sh index f03c65f..2ab5c62 100755 --- a/os/routers/glmain/push.sh +++ b/os/routers/glmain/push.sh @@ -26,27 +26,27 @@ echo "using 🤖 $server" ask "continue update" echo "Updating conf..." -# ./gen-mappings.py +./gen-mappings.py cat output/summary.yaml ask "continue update" -scp -O output/etc/dnsmasq.conf "$server:/tmp/dnsmasq.new.conf" +# scp -O output/etc/dnsmasq.conf "$server:/tmp/dnsmasq.new.conf" scp -O output/etc/ethers "$server:/etc/ethers" -ssh "$server" << EOF -echo 'Backing up dnsmasq.conf file to /tmp/dnsmasq.old.conf' -cp /etc/dnsmasq.conf /tmp/dnsmasq.old.conf -echo 'Updating dnsmasq.conf 🙇🏼' -cp /tmp/dnsmasq.new.conf /etc/dnsmasq.conf -if dnsmasq --test ; then - /etc/init.d/dnsmasq restart -else - echo "Updated Failed! 🚨" - echo "Attempting to revert back..." - cp /tmp/dnsmasq.old.conf /etc/dnsmasq.conf - dnsmasq --test - echo "Revert successful! 👍" -fi -EOF +# ssh "$server" << EOF +# echo 'Backing up dnsmasq.conf file to /tmp/dnsmasq.old.conf' +# cp /etc/dnsmasq.conf /tmp/dnsmasq.old.conf +# echo 'Updating dnsmasq.conf 🙇🏼' +# cp /tmp/dnsmasq.new.conf /etc/dnsmasq.conf +# if dnsmasq --test ; then +# /etc/init.d/dnsmasq restart +# else +# echo "Updated Failed! 🚨" +# echo "Attempting to revert back..." +# # cp /tmp/dnsmasq.old.conf /etc/dnsmasq.conf +# dnsmasq --test +# echo "Revert successful! 👍" +# fi +# EOF git add . git commit -m "🤖 Updated Router Config at $(date)"