changed namespace for device types and smartapps

sgupta999 · sgupta999 · commit 892cb723d23c · 2019-11-21T19:30:00.000-06:00
diff --git a/DOCKER.md b/DOCKER.md
@@ -65,4 +65,35 @@ docker run -p:8080:8080 \
 		   --name mbs-rpi 
 		   sgupta99/mqtt-bridge-smartthings:1.0.3-rpi
 ```	   
-The RPI distro is about 768MB and Alpine is about 136MB - so I would still go for the alpine distro
+The RPI distro is about 768MB and Alpine is about 136MB - so I would still go for the alpine distro
+
+# Docker Compose
+
+If you want to bundle everything together, you can use [Docker Compose](https://docs.docker.com/compose/). This will install and run both mosquitto and MBS - you still need to make sure mosquitto.com and mbs config files are in the right directories.
+
+Just create a file called docker-compose.yml with these contents:
+```
+mqtt:
+    image: eclipse-mosquitto
+    container_name: mqtt
+    environment:
+        - TZ=America/Chicago
+    volumes:
+        - D:/data/docker/volumes/mosquitto/config:/mosquitto/config
+        - D:/data/docker/volumes/mosquitto/data:/mosquitto/data
+        - D:/data/docker/volumes/mosquitto/log:/mosquitto/log
+    ports:
+        - 1883:1883
+        - 9001:9001
+
+mqttbridge:
+    image: sgupta99/mqtt-bridge-smartthings:1.0.3-alpine
+    container_name: mbs
+    environment:
+        - TZ=America/Chicago
+    volumes:
+        - D:/data/docker/volumes/mbs:/mbs/config
+    ports:
+        - 8080:8080
+```
+
diff --git a/devicetypes/gupta/combo.src/ComboContactSensorSwitch.groovy b/devicetypes/gupta/combo.src/ComboContactSensorSwitch.groovy
diff --git a/devicetypes/gupta/combo.src/ComboSwitchContactSensor.groovy b/devicetypes/gupta/combo.src/ComboSwitchContactSensor.groovy
diff --git a/devicetypes/gupta/mqtt/mbs-bridge.src/mbs-bridge.groovy b/devicetypes/gupta/mqtt/mbs-bridge.src/mbs-bridge.groovy
@@ -26,7 +26,7 @@ import groovy.json.JsonSlurper
 import groovy.json.JsonOutput
 
 metadata {
-    definition (name: "MBS Bridge", namespace: "gupta", author: "Sandeep Gupta") {
+    definition (name: "MBS Bridge", namespace: "gupta/mqtt", author: "Sandeep Gupta") {
         capability "Notification"
     }
 
diff --git a/devicetypes/gupta/mqtt/tasmota.src/TasmotaContactSensor.groovy b/devicetypes/gupta/mqtt/tasmota.src/TasmotaContactSensor.groovy
@@ -20,7 +20,7 @@
  
 metadata {
 
-    definition (name: "Tasmota Contact Sensor", namespace: "gupta", author: "Sandeep Gupta") {
+    definition (name: "Tasmota Contact Sensor", namespace: "gupta/mqtt", author: "Sandeep Gupta") {
         capability "Contact Sensor"	
 		capability "Actuator"
 		capability "Refresh"
diff --git a/devicetypes/gupta/mqtt/tasmota.src/TasmotaSensorSwitch.groovy b/devicetypes/gupta/mqtt/tasmota.src/TasmotaSensorSwitch.groovy
@@ -20,7 +20,7 @@
  
 metadata {
 
-    definition (name: "Tasmota SensorSwitch", namespace: "gupta", author: "Sandeep Gupta") {
+    definition (name: "Tasmota SensorSwitch", namespace: "gupta/mqtt", author: "Sandeep Gupta") {
 		capability "Actuator"
         capability "Contact Sensor"	
         capability "Switch"
diff --git a/devicetypes/gupta/mqtt/tasmota.src/TasmotaSwitch.groovy b/devicetypes/gupta/mqtt/tasmota.src/TasmotaSwitch.groovy
@@ -20,7 +20,7 @@
  
 metadata {
 
-    definition (name: "Tasmota Switch", namespace: "gupta", author: "Sandeep Gupta") {
+    definition (name: "Tasmota Switch", namespace: "gupta/mqtt", author: "Sandeep Gupta") {
 		capability "Actuator"
         capability "Switch"
 		capability "Refresh"
diff --git a/devicetypes/gupta/mqtt/tasmota.src/TasmotaSwitchSensor.groovy b/devicetypes/gupta/mqtt/tasmota.src/TasmotaSwitchSensor.groovy
@@ -20,7 +20,7 @@
  
 metadata {
 
-    definition (name: "Tasmota SwitchSensor", namespace: "gupta", author: "Sandeep Gupta") {
+    definition (name: "Tasmota SwitchSensor", namespace: "gupta/mqtt", author: "Sandeep Gupta") {
 		capability "Actuator"
         capability "Switch"
 		capability "Momentary"
diff --git a/smartapps/gupta/mqtt/mbs-smartapp.src/mbs-smartapp-full.groovy b/smartapps/gupta/mqtt/mbs-smartapp.src/mbs-smartapp-full.groovy
@@ -467,7 +467,7 @@ import groovy.transform.Field
 
 definition(
     name: "MBS SmartApp Full",
-    namespace: "gupta",
+    namespace: "gupta/mqtt",
     author: "Sandeep Gupta",
     description: "An MQTT bridge to SmartThings [MBS-SmartApp-Full]",
     category: "My Apps",
diff --git a/smartapps/gupta/mqtt/mbs-smartapp.src/mbs-smartapp-lite.groovy b/smartapps/gupta/mqtt/mbs-smartapp.src/mbs-smartapp-lite.groovy
@@ -96,7 +96,7 @@ import groovy.transform.Field
 
 definition(
     name: "MBS SmartApp Lite",
-    namespace: "gupta",
+    namespace: "gupta/mqtt",
     author: "Sandeep Gupta",
     description: "An MQTT bridge to SmartThings [MBS-SmartApp-Lite]",
     category: "My Apps",

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ import groovy.json.JsonSlurper`
`26`	`26`	`import groovy.json.JsonOutput`
`27`	`27`
`28`	`28`	`metadata {`
`29`		`- definition (name: "MBS Bridge", namespace: "gupta", author: "Sandeep Gupta") {`
	`29`	`+ definition (name: "MBS Bridge", namespace: "gupta/mqtt", author: "Sandeep Gupta") {`
`30`	`30`	`capability "Notification"`
`31`	`31`	`}`
`32`	`32`