Remove duplicate ucentralgw-ui entry and adapt Docker Compose CI job to microservice structure

Adapt new config file changes

Fix script name

Add working-directory

Run docker-compose exec in the background

Test Github actions working-directory behaviour

Revert previous test

Change shebang path

Add some debug information to workflow

Disable pseudo-tty allocation

Fix variable name

.github/workflows/ci.yml

@@ -62,17 +62,6 @@ jobs:
     - name: Check out repository
       uses: actions/checkout@v2
 
-    - name: Create certificate and key files from Github secrets
-      env:
-        DIGICERT_TIP_WILDCARD_CERT: ${{ secrets.DIGICERT_TIP_WILDCARD_CERT }}
-        DIGICERT_TIP_WILDCARD_KEY: ${{ secrets.DIGICERT_TIP_WILDCARD_KEY }}
-      run: |
-        cat certificates/issuer.pem certificates/root.pem > docker-compose/ucentral-data/certs/restapi-ca.pem
-        echo "$DIGICERT_TIP_WILDCARD_CERT" > docker-compose/ucentral-data/certs/websocket-cert.pem
-        echo "$DIGICERT_TIP_WILDCARD_CERT" > docker-compose/ucentral-data/certs/restapi-cert.pem
-        echo "$DIGICERT_TIP_WILDCARD_KEY" > docker-compose/ucentral-data/certs/websocket-key.pem
-        echo "$DIGICERT_TIP_WILDCARD_KEY" > docker-compose/ucentral-data/certs/restapi-key.pem
-
     - name: Instantiate Docker Compose deployment
       working-directory: ./docker-compose
       env:
@@ -80,12 +69,12 @@ jobs:
       run: |
         docker-compose up -d
 
-    - name: Wait for uCentralGW to be alive and kicking
+    - name: Wait for uCentralSec to be alive and kicking
       run: |
         n=0
         until [ "$n" -ge 3 ]
         do
-          curl -s 127.0.0.1:15015 && break
+          curl -s 127.0.0.1:16102 && break
           n=$((n+1)) 
           if [ "$n" -eq 3]; then        
             exit 1
@@ -94,10 +83,15 @@ jobs:
           fi
         done
 
-    - name: Check functionality of uCentralGW
+    - name: Add self-signed certificates to system trust store of containers
+      working-directory: ./docker-compose
+      run: |
+        ./add-ca-cert.sh
+
+    - name: Check functionality of microservices
       env:
-        UCENTRALGW: "ucentral.cicd.lab.wlan.tip.build:16001"
-        FLAGS: "-s --cacert docker-compose/ucentral-data/certs/restapi-ca.pem --resolve ucentral.cicd.lab.wlan.tip.build:16001:127.0.0.1"
+        UCENTRALSEC: "ucentral.wlan.local:16001"
+        FLAGS: "-s --cacert docker-compose/certs/restapi-ca.pem --resolve ucentral.wlan.local:16001:127.0.0.1"
       run: |
         ./test_scripts/curl/cli listdevices
 

docker-compose/add-ca-cert.sh

@@ -4,7 +4,7 @@ set -e
 SERVICES="ucentralgw.wlan.local ucentralsec.wlan.local"
 
 for i in $SERVICES; do
-    docker-compose exec $i apk add ca-certificates
+    docker-compose exec -T $i apk add ca-certificates
     docker cp certs/restapi-ca.pem ucentral_$i\_1:/usr/local/share/ca-certificates/
-    docker-compose exec $i update-ca-certificates
+    docker-compose exec -T $i update-ca-certificates
 done

docker-compose/docker-compose.yml

@@ -82,16 +82,6 @@ services:
       - ../certificates/issuer.pem:/ucentralsec-data/certs/issuer.pem
       - ../certificates/clientcas.pem:/ucentralsec-data/certs/clientcas.pem
 
-  ucentralgw-ui:
-    image: "tip-tip-wlan-cloud-ucentral.jfrog.io/ucentralgw-ui:${UCENTRALGWUI_TAG}"
-    env_file:
-      - .env_ucentralgw-ui
-    depends_on:
-      - ucentralgw
-    restart: unless-stopped
-    ports:
-      - "127.0.0.1:80:80"
-
   rttys:
     image: "tip-tip-wlan-cloud-ucentral.jfrog.io/rttys:${RTTYS_TAG}"
     depends_on: 

docker-compose/ucentralgw-data/ucentralgw.properties

@@ -60,8 +60,12 @@ ucentral.fileuploader.maxsize = 10000
 ucentral.service.key = $UCENTRALGW_ROOT/certs/restapi-key.pem
 ucentral.system.data = $UCENTRALGW_ROOT/data
 ucentral.system.debug = true
+#ucentral.system.uri.private = https://localhost:17002
+#ucentral.system.uri.public = https://local.dpaas.arilia.com:16002
+#ucentral.system.uri.ui = https://ucentral-ui.arilia.com
 ucentral.system.uri.private = https://ucentralgw.wlan.local:17002
 ucentral.system.uri.public = https://ucentral.wlan.local:16002
+ucentral.system.uri.ui = http://127.0.0.1
 ucentral.system.commandchannel = /tmp/app.ucentralgw
 
 #
@@ -93,16 +97,14 @@ rtty.viewport = 5913
 alb.enable = true
 alb.port = 16102
 
-oui.download.uri = https://linuxnet.ca/ieee/oui.txt
-
 #
 # Kafka
 #
 ucentral.kafka.group.id = gateway
 ucentral.kafka.client.id = gateway1
 ucentral.kafka.enable = true
-# ucentral.kafka.brokerlist = a1.arilia.com:9092
 ucentral.kafka.brokerlist = kafka:9092
+# ucentral.kafka.brokerlist = debfarm1-node-c.arilia.com:9092
 ucentral.kafka.auto.commit = false
 ucentral.kafka.queue.buffering.max.ms = 50
 
@@ -138,6 +140,17 @@ storage.type.mysql.database = ucentral
 storage.type.mysql.port = 3306
 storage.type.mysql.connectiontimeout = 60
 
+archiver.enabled = true
+archiver.schedule = 03:00
+archiver.db.0.name = healthchecks
+archiver.db.0.keep = 7
+archiver.db.1.name = statistics
+archiver.db.1.keep = 7
+archiver.db.2.name = devicelogs
+archiver.db.2.keep = 7
+archiver.db.3.name = commandlist
+archiver.db.3.keep = 7
+
 ########################################################################
 ########################################################################
 #

docker-compose/ucentralsec-data/ucentralsec.properties

@@ -15,6 +15,7 @@ ucentral.restapi.host.0.port = 16001
 ucentral.restapi.host.0.cert = $UCENTRALSEC_ROOT/certs/restapi-cert.pem
 ucentral.restapi.host.0.key = $UCENTRALSEC_ROOT/certs/restapi-key.pem
 ucentral.restapi.host.0.key.password = mypassword
+ucentral.restapi.wwwassets = $UCENTRALSEC_ROOT/wwwassets
 
 ucentral.internal.restapi.host.0.backlog = 100
 ucentral.internal.restapi.host.0.security = relaxed
@@ -31,12 +32,10 @@ ucentral.internal.restapi.host.0.key.password = mypassword
 authentication.enabled = true
 authentication.default.username = tip@ucentral.com
 authentication.default.password = 13268b7daa751240369d125e79c873bd8dd3bef7981bdfd38ea03dbb1fbe7dcf
-authentication.default.access = master
-authentication.service.type = internal
 ucentral.system.data = $UCENTRALSEC_ROOT/data
-ucentral.system.debug = true
 ucentral.system.uri.private = https://ucentralsec.wlan.local:17001
 ucentral.system.uri.public = https://ucentral.wlan.local:16001
+ucentral.system.uri.ui = http://127.0.0.1
 ucentral.system.commandchannel = /tmp/app.ucentralsec
 ucentral.service.key = $UCENTRALSEC_ROOT/certs/restapi-key.pem
 
@@ -45,9 +44,10 @@ ucentral.service.key = $UCENTRALSEC_ROOT/certs/restapi-key.pem
 #
 mailer.hostname = smtp.gmail.com
 mailer.username = no-reply@arilia.com
-mailer.password = **************************
+mailer.password = pink-elephants-play-hockey
 mailer.loginmethod = login
 mailer.port = 587
+mailer.templates = $UCENTRALSEC_ROOT/templates
 
 
 #############################