Commit 077a7e43 authored by Yann Garcia's avatar Yann Garcia
Browse files

Add MQTT over WSS to ACME

parent 49386149

charts/meep-cloud-mosquitto/values-template.yaml

+2 −2
Original line number Diff line number Diff line
@@ -59,10 +59,10 @@ ingress: 
    nginx.ingress.kubernetes.io/force-ssl-redirect: {{ .HttpsOnly }}

    {{- if .IsMepService }}

    nginx.ingress.kubernetes.io/configuration-snippet: |

      rewrite ^/{{.SandboxName}}/{{.MepName}}/meep-cloud-mosquitto(/|$)(.*)$ /meep-cloud-mosquitto/$2 break;

      rewrite ^/{{.SandboxName}}/{{.MepName}}/meep-cloud-mosquitto(/|$)(.*)$ /$2 break;

    {{- else }}

    nginx.ingress.kubernetes.io/configuration-snippet: |

      rewrite ^/{{.SandboxName}}/meep-cloud-mosquitto(/|$)(.*)$ /meep-cloud-mosquitto/$2 break;

      rewrite ^/{{.SandboxName}}/meep-cloud-mosquitto(/|$)(.*)$ /$2 break;

    {{- end }}

    {{- if .AuthEnabled }}

    nginx.ingress.kubernetes.io/auth-url: https://$http_host/auth/v1/authenticate?svc=meep-cloud-mosquitto&sbox={{.SandboxName}}&mep={{.MepName}}

charts/meep-federation/values-template.yaml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ image: 
    MEEP_SANDBOX_NAME: {{.SandboxName}}

    MEEP_SVC_PATH: /fed_enablement/v1

    MEEP_HOST_URL: {{.HostUrl}}

    MEEP_BROKER: mqtt://meep-cloud-mosquitto:1883

    MEEP_BROKER: mqtt://meep-cloud-mosquitto:9001

    MEEP_TOPIC: ETSI/MEC/Federation

    {{- if .IsMepService }}

    MEEP_MEP_NAME: {{.MepName}}

charts/meep-mosquitto/values-template.yaml

+2 −2
Original line number Diff line number Diff line
@@ -59,10 +59,10 @@ ingress: 
    nginx.ingress.kubernetes.io/force-ssl-redirect: {{ .HttpsOnly }}

    {{- if .IsMepService }}

    nginx.ingress.kubernetes.io/configuration-snippet: |

      rewrite ^/{{.SandboxName}}/{{.MepName}}/meep-mosquitto(/|$)(.*)$ /meep-mosquitto/$2 break;

      rewrite ^/{{.SandboxName}}/{{.MepName}}/meep-mosquitto(/|$)(.*)$ /$2 break;

    {{- else }}

    nginx.ingress.kubernetes.io/configuration-snippet: |

      rewrite ^/{{.SandboxName}}/meep-mosquitto(/|$)(.*)$ /meep-mosquitto/$2 break;

      rewrite ^/{{.SandboxName}}/meep-mosquitto(/|$)(.*)$ /$2 break;

    {{- end }}

    {{- if .AuthEnabled }}

    nginx.ingress.kubernetes.io/auth-url: https://$http_host/auth/v1/authenticate?svc=meep-mosquitto&sbox={{.SandboxName}}&mep={{.MepName}}

go-apps/meep-iot-pltf/meep-acme-in-cse/acme.ini.in

+9 −4
Original line number Diff line number Diff line
@@ -32,8 +32,13 @@ consoleTheme=dark 
[mqtt]

enable=$MQTT_ENABLE

address=$MQTT_HOST

keepalive=45



[mqtt.websocket]

enable=$MQTT_ENABLE

port=$MQTT_PORT

listenIF = 0.0.0.0

transport=websockets

path=$WEBSOCK_ETPATH



[cse.registration]

; Edit this to add more allowed originators.

go-apps/meep-iot-pltf/meep-acme-in-cse/entrypoint.sh

+25 −20
Original line number Diff line number Diff line
@@ -2,14 +2,19 @@ 
set -e



SERVER_IP="${MEEP_HOST_URL#http://}"; MEEP_HOST_URL="${MEEP_HOST_URL#https://}"



echo "MEEP_HOST_URL: ${MEEP_HOST_URL}"

echo "MEC_PLATFORM=$MEC_PLATFORM"

echo "MEEP_SANDBOX_NAME=$MEEP_SANDBOX_NAME"



# Other environment variables

echo "SERVER_TYPE: ${SERVER_TYPE}"

echo "SERVER_PORT: ${SERVER_PORT}"

echo "MQTT_ENABLE: ${MQTT_ENABLE}"



echo "CSE_BASE_NAME: ${CSE_BASE_NAME}"

echo "CSE_BASE_RI: ${CSE_BASE_RI}"



echo "MQTT_ENABLE: ${MQTT_ENABLE}"

echo "MQTT_HOST: ${MQTT_HOST}"

echo "MQTT_PORT: ${MQTT_PORT}"

echo "MQTT_USERNAME: ${MQTT_USERNAME}"
@@ -45,27 +50,23 @@ fi 


sleep 5 # Wait for ETSI MEC Platform up and stable



SERVER_IP=`echo $SERVER_IP | sed -e "s/https:\/\///g"` # Remove https://MQTT_ENABLE=${MQTT_ENABLE:-true}

MQTT_HOST=${SERVER_IP:- "meep-mosquitto"}

SERVER_IP=`echo $SERVER_IP | sed -e "s/https:\/\///g"` # Remove https://

SERVER_PORT=${SERVER_PORT:-3003}

MEC_SANDBOX_ID=${MEEP_SANDBOX_NAME:-"meep-sandbox"}



CSE_BASE_NAME=${CSE_BASE_NAME:-"laboai-cse-in"}

CSE_BASE_RI=${CSE_BASE_RI:-"laboai-id-in"}

SERVER_TYPE=${SERVER_TYPE:-"IN"}

ENABLE_COAP=${ENABLE_COAP:-false}

ENABLE_WS=${ENABLE_WS:-false}



export MQTT_ENABLE

export MQTT_HOST

export MQTT_PORT

export MQTT_USERNAME

export MQTT_PASSWORD

export SERVER_PORT

export SERVER_TYPE

export SERVER_IP

export ENABLE_COAP

export ENABLE_WS

export CSE_BASE_NAME

export CSE_BASE_RI

# MQTT Configuration

MQTT_ENABLE=${MQTT_ENABLE:-true}

MQTT_HOST=${MOSQUITTO_NODE_IP_ADDRESS:-"meep-cloud-mosquito"}

MQTT_PORT=${MOSQUITTO_NODE_PORT:-1883}

MQTT_USERNAME=${MQTT_USERNAME:-"acme-mn-cse"}

MQTT_PASSWORD=${MQTT_PASSWORD:-"mqtt"}



WEBSOCK_ETPATH="/$MEC_SANDBOX_ID"${WEBSOCK_ETPATH:-"/monaco-telecom/meep-cloud-mosquitto"}



echo "Environment variables set:"

echo "SERVER_TYPE: ${SERVER_TYPE}"
@@ -73,26 +74,30 @@ echo "SERVER_IP: ${SERVER_IP}" 
echo "SERVER_PORT: ${SERVER_PORT}"

echo "CSE_BASE_NAME: ${CSE_BASE_NAME}"

echo "CSE_BASE_RI: ${CSE_BASE_RI}"

echo "ENABLE_COAP: ${ENABLE_COAP}"

echo "ENABLE_WS: ${ENABLE_WS}"

echo "MQTT_ENABLE: ${MQTT_ENABLE}"

echo "MQTT_HOST: ${MQTT_HOST}"

echo "MQTT_PORT: ${MQTT_PORT}"

echo "MQTT_USERNAME: ${MQTT_USERNAME}"

echo "MQTT_PASSWORD: ${MQTT_PASSWORD}"

echo "ENABLE_COAP: ${ENABLE_COAP}"

echo "ENABLE_WS: ${ENABLE_WS}"

echo "WEBSOCK_ETPATH: ${WEBSOCK_ETPATH}"



export SERVER_TYPE

export SERVER_IP

export SERVER_PORT



export CSE_BASE_NAME

export CSE_BASE_RI

export ENABLE_COAP

export ENABLE_WS



export MQTT_ENABLE

export MQTT_HOST

export MQTT_PORT

export MQTT_USERNAME

export MQTT_PASSWORD

export ENABLE_COAP

export ENABLE_WS

export WEBSOCK_ETPATH



workdir="/usr/src/app/ACME-oneM2M-CSE"

cd "$workdir" || { echo "Directory $workdir not found"; exit 1; }