rwth-acis · Aran30 · Nov 29, 2022 · Nov 29, 2022 · Nov 30, 2022 · Dec 2, 2022
diff --git a/.github/workflows/docker-CI.yml b/.github/workflows/docker-CI.yml
@@ -3,7 +3,7 @@ name: Docker Build and Push
 on:
   push:
 
-    branches: [ master, develop]
+    branches: [ master, develop, MA-aaron]
 
 
 jobs:

diff --git a/SBF.sql b/SBF.sql
@@ -21,7 +21,7 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- Table structure for attributes
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS `attributes`  (
-  `id` int(12) NOT NULL AUTO_INCREMENT,
+  `id` varchar(255) NOT NULL AUTO_INCREMENT,
   `bot` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `channel` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `user` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -18,7 +18,6 @@ export CORE_VERSION=$(awk -F "=" '/core.version/ {print $2}' gradle.properties)
 function set_in_service_config {
     sed -i "s?${1}[[:blank:]]*=.*?${1}=${2}?g" ${SERVICE_PROPERTY_FILE}
 }
-cp $SERVICE_PROPERTY_FILE.sample $SERVICE_PROPERTY_FILE
 set_in_service_config databaseName ${DATABASE_NAME}
 set_in_service_config databaseHost ${DATABASE_HOST}
 set_in_service_config databasePort ${DATABASE_PORT}
@@ -27,6 +26,8 @@ set_in_service_config databasePassword ${DATABASE_PASSWORD}
 set_in_service_config address ${ADDRESS}
 set_in_service_config restarterBotName ${RESTARTERBOTNAME}
 set_in_service_config restarterBotPW ${RESTARTERBOTPW}
+set_in_service_config lrsURL ${LRS_URL}
+set_in_service_config lrsAuthToken ${LRS_AUTH_TOKEN}
 
 
 # ensure the database is ready

diff --git a/etc/i5.las2peer.connectors.webConnector.WebConnector.properties b/etc/i5.las2peer.connectors.webConnector.WebConnector.properties
@@ -0,0 +1,14 @@
+httpPort = 8080
+httpsPort = 8090
+startHttp = TRUE
+startHttps = FALSE
+sslKeystore = etc/example.jks
+sslKeyPassword = secretpassword
+crossOriginResourceDomain = *
+crossOriginResourceMaxAge = 60
+enableCrossOriginResourceSharing = TRUE
+onlyLocalServices = FALSE
+defaultLoginUser = anonymous
+defaultLoginPassword = anonymous
+# this somehow breaks swagger.json call
+#oidcProviders = https://api.learning-layers.eu/o/oauth2,https://accounts.google.com
diff --git a/etc/i5.las2peer.services.socialBotManagerService.SocialBotManagerService.properties b/etc/i5.las2peer.services.socialBotManagerService.SocialBotManagerService.properties
@@ -1,8 +1,10 @@
 databaseUser = root
-databasePassword = root
+databasePassword = password
 databaseName = LAS2PEERMON
 databaseHost = 127.0.0.1
 databasePort = 3306
-address = http://127.0.0.1:8080
+address = http://127.0.0.1:8090
 restarterBotName =
 restarterBotPW =
+lrsAuthToken = 
+lrsURL = 
diff --git a/etc/i5.las2peer.services.socialBotManagerService.SocialBotManagerService.properties.sample b/etc/i5.las2peer.services.socialBotManagerService.SocialBotManagerService.properties.sample
@@ -1,8 +1,10 @@
 databaseUser = root
-databasePassword = root
+databasePassword = password
 databaseName = LAS2PEERMON
-databaseHost = host.docker.internal
+databaseHost = 127.0.0.1
 databasePort = 3306
-address = http://127.0.0.1:8080
+address = http://127.0.0.1:8090
 restarterBotName =  
-restarterBotPW =
+restarterBotPW =
+lrsAuthToken = 
+lrsURL = 
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-core.version=1.2.3
+core.version=1.2.4
 service.name=i5.las2peer.services.socialBotManagerService
 service.class=SocialBotManagerService
 service.version=1.5.3
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: Docker Build and Push @@
     on:
       push:
-        branches: [ master, develop]
+        branches: [ master, develop, MA-aaron]
     jobs:
@@ Expand Down @@