diff --git a/.gitignore b/.gitignore index 86846f58d2680ec4dfb77193f7e2706ed7f90be6..1beafc828f56489ccd387bc83743b757311625bc 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,7 @@ prometheus/ wavs/ zips/ /dev-certificates -.idea \ No newline at end of file +.idea +/docker/ingress/config/*.crt +/docker/ingress/config/*.pem +/docker/ingress/config/*.key \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 3c3b63a9c4bcd9356bb56a619e1d7ee57d66f378..c5c2de9d6f43b76d9de73a01c49452d5b2db91a9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -68,6 +68,13 @@ services: build: ./context/ env_file: - docker/variables.env + + smartdata-context-ingress: + build: ./ingress/ + env_file: + - docker/variables.env + volumes: + - ./docker/ingress/config:/app/config volumes: certificates: mariadb: diff --git a/docker/ingress/config/jobs.json b/docker/ingress/config/jobs.json new file mode 100644 index 0000000000000000000000000000000000000000..4865cd4f35c0a4b18c132677390393f1d3b38b25 --- /dev/null +++ b/docker/ingress/config/jobs.json @@ -0,0 +1,6 @@ +{ + "import-tikiwiki-test": { + "command": "tikiwiki-import test", + "schedule": "* * * * *" + } +} \ No newline at end of file diff --git a/docker/ingress/config/tikiwiki.json b/docker/ingress/config/tikiwiki.json new file mode 100644 index 0000000000000000000000000000000000000000..5b3a82110357af01850e9bfa821f3e1fe2955f55 --- /dev/null +++ b/docker/ingress/config/tikiwiki.json @@ -0,0 +1,15 @@ +{ + "domains": { + "test" : { + "certificate": "./config/test.crt", + "key": "./config/test.key", + "api": "https://172.18.0.1", + "trackers": { + "vehicleList": "Vehicle List", + "vehicleMaintenancePlan": "Vehicle Maintenance Plan", + "vehicleMaintenanceReport": "Vehicle Maintenance Report", + "vehicleMaintenanceReportErrorCodes": "Vehicle Failure" + } + } + } +} \ No newline at end of file diff --git a/docker/variables.env b/docker/variables.env index 730ca1ee7311cee43f44381981511a59575d27e5..6c9cb99f62586c0d4fe77ae541b328868feaedcd 100644 --- a/docker/variables.env +++ b/docker/variables.env @@ -23,3 +23,10 @@ MONGO_USERNAME=smartdatacontext MONGO_PASSWORD=smartdatacontext MONGO_DATABASE=smartdatacontext MONGO_HOST=mongo + +# TikiWiki +TIKIWIKIDB_HOST=172.18.0.1 +TIKIWIKIDB_PORT=3307 +TIKIWIDB_DATABASE=tikiwiki +TIKIWIKDB_USERNAME=tikiwiki +TIKIWIKIDB_PASSWORD=tikiwiki \ No newline at end of file