diff --git a/LICENSEINFO.md b/LICENSEINFO.md index c8f660a..f790349 100644 --- a/LICENSEINFO.md +++ b/LICENSEINFO.md @@ -1,7 +1,7 @@ **Surveillance under Surveillance** uses code, data, icons and fonts that are licensed under different licenses: -* Code of [osmcamera](https://github.com/khris78/osmcamera) — [CC-BY-SA / MIT / GPLv3 / WTFPL](./www/sunders/files/license_osmcamera.txt) -* Code of [Leaflet/Leaflet](https://github.com/Leaflet/Leaflet) — [BSD-2-Clause](./www/sunders/files/license_Leaflet.txt) +* Code of [osmcamera](https://github.com/khris78/osmcamera) — [CC-BY-SA / MIT / GPLv3 / WTFPL](./web/www/sunders/files/license_osmcamera.txt) +* Code of [Leaflet/Leaflet](https://github.com/Leaflet/Leaflet) — [BSD-2-Clause](./web/www/sunders/files/license_Leaflet.txt) * Data of [OpenStreetMap](https://www.openstreetmap.org/) — [ODbL / CC BY-SA](https://www.openstreetmap.org/copyright) * Data of [OpenStreetMap Nominatim](https://nominatim.openstreetmap.org/) — [ODbL](https://www.openstreetmap.org/copyright) * Data of [GeoNames](https://www.geonames.org/) — [CC BY 3.0](https://creativecommons.org/licenses/by/3.0/) diff --git a/README.md b/README.md index d4b38c1..940c6a0 100644 --- a/README.md +++ b/README.md @@ -109,38 +109,38 @@ Key | Value * The font [Grabstein Grotesk](https://fontlibrary.org/de/font/grabstein-grotesk) [OLF] is used for the titles. -[img_red]: ./www/sunders/images/colorRed.png "Public surveillance" -[img_redall]: ./www/sunders/images/colorRedAll.png "Public surveillance" +[img_red]: ./web/www/sunders/images/colorRed.png "Public surveillance" +[img_redall]: ./web/www/sunders/images/colorRedAll.png "Public surveillance" -[img_blue]: ./www/sunders/images/colorBlue.png "Outdoor surveillance" -[img_blueall]: ./www/sunders/images/colorBlueAll.png "Outdoor surveillance" +[img_blue]: ./web/www/sunders/images/colorBlue.png "Outdoor surveillance" +[img_blueall]: ./web/www/sunders/images/colorBlueAll.png "Outdoor surveillance" -[img_green]: ./www/sunders/images/colorGreen.png "Indoor surveillance" -[img_greenall]: ./www/sunders/images/colorGreenAll.png "Indoor surveillance" +[img_green]: ./web/www/sunders/images/colorGreen.png "Indoor surveillance" +[img_greenall]: ./web/www/sunders/images/colorGreenAll.png "Indoor surveillance" -[img_cam]: ./www/sunders/images/cam.png "Camera" -[img_camall]: ./www/sunders/images/camAll.png "Cameras" -[img_todo_camall]: ./www/sunders/images/todo_camAll.png "Cameras, fixme" +[img_cam]: ./web/www/sunders/images/cam.png "Camera" +[img_camall]: ./web/www/sunders/images/camAll.png "Cameras" +[img_todo_camall]: ./web/www/sunders/images/todo_camAll.png "Cameras, fixme" -[img_fixed]: ./www/sunders/images/fixed.png "Fixed camera" -[img_fixedall]: ./www/sunders/images/fixedAll.png "Fixed cameras" -[img_todo_fixedall]: ./www/sunders/images/todo_fixedAll.png "Fixed cameras, fixme" +[img_fixed]: ./web/www/sunders/images/fixed.png "Fixed camera" +[img_fixedall]: ./web/www/sunders/images/fixedAll.png "Fixed cameras" +[img_todo_fixedall]: ./web/www/sunders/images/todo_fixedAll.png "Fixed cameras, fixme" -[img_panning]: ./www/sunders/images/panning.png "Panning camera" -[img_panningall]: ./www/sunders/images/panningAll.png "Panning cameras" -[img_todo_panningall]: ./www/sunders/images/todo_panningAll.png "Panning cameras, fixme" +[img_panning]: ./web/www/sunders/images/panning.png "Panning camera" +[img_panningall]: ./web/www/sunders/images/panningAll.png "Panning cameras" +[img_todo_panningall]: ./web/www/sunders/images/todo_panningAll.png "Panning cameras, fixme" -[img_dome]: ./www/sunders/images/dome.png "Dome camera" -[img_domeall]: ./www/sunders/images/domeAll.png "Dome cameras" -[img_todo_domeall]: ./www/sunders/images/todo_domeAll.png "Dome cameras, fixme" +[img_dome]: ./web/www/sunders/images/dome.png "Dome camera" +[img_domeall]: ./web/www/sunders/images/domeAll.png "Dome cameras" +[img_todo_domeall]: ./web/www/sunders/images/todo_domeAll.png "Dome cameras, fixme" -[img_guard]: ./www/sunders/images/guard.png "Guard" -[img_guardall]: ./www/sunders/images/guardAll.png "Guards" -[img_todo_guardall]: ./www/sunders/images/todo_guardAll.png "Guards, fixme" +[img_guard]: ./web/www/sunders/images/guard.png "Guard" +[img_guardall]: ./web/www/sunders/images/guardAll.png "Guards" +[img_todo_guardall]: ./web/www/sunders/images/todo_guardAll.png "Guards, fixme" -[img_traffic]: ./www/sunders/images/traffic.png "Automatic Licence Plate Recognition" -[img_todo_traffic]: ./www/sunders/images/todo_traffic.png "Automatic Licence Plate Recognition, fixme" +[img_traffic]: ./web/www/sunders/images/traffic.png "Automatic Licence Plate Recognition" +[img_todo_traffic]: ./web/www/sunders/images/todo_traffic.png "Automatic Licence Plate Recognition, fixme" -[img_example1]: ./www/sunders/images/fixed_z-17_d-90_a-15_h-5.png "Field of view (direction: 90°, angle: 15°, height: 5m)" -[img_example2]: ./www/sunders/images/fixed_z-17_d-90_a-15_h-10.png "Field of view (direction: 90°, angle: 15°, height: 10m)" -[img_example3]: ./www/sunders/images/fixed_z-17_d-90_a-60_h-10.png "Field of view (direction: 90°, angle: 60°, height: 10m)" \ No newline at end of file +[img_example1]: ./web/www/sunders/images/fixed_z-17_d-90_a-15_h-5.png "Field of view (direction: 90°, angle: 15°, height: 5m)" +[img_example2]: ./web/www/sunders/images/fixed_z-17_d-90_a-15_h-10.png "Field of view (direction: 90°, angle: 15°, height: 10m)" +[img_example3]: ./web/www/sunders/images/fixed_z-17_d-90_a-60_h-10.png "Field of view (direction: 90°, angle: 60°, height: 10m)" \ No newline at end of file diff --git a/data_handler/Containerfile b/data_handler/Containerfile index 5cdf7b9..342ae74 100644 --- a/data_handler/Containerfile +++ b/data_handler/Containerfile @@ -1,5 +1,5 @@ -FROM ghcr.io/asohh/fedora-minimal-containers/php-cli:43 -RUN microdnf install -y php-mysqli php-bcmath php-xml python-lxml gunzip https://raw.githubusercontent.com/rpmsphere/x86_64/master/d/dcron-4.5-7.1.x86_64.rpm && microdnf clean all +FROM quay.io/fedora/fedora-minimal:43 +RUN microdnf install -y php-cli php-mysqli php-bcmath php-xml python-lxml gunzip https://raw.githubusercontent.com/rpmsphere/x86_64/master/d/dcron-4.5-7.1.x86_64.rpm && microdnf clean all COPY ./utils/* /opt/ COPY ./data_init/*.sql /opt/init/init.sql diff --git a/docker-compose.yml b/docker-compose.yml index 045d853..cacf904 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ services: ports: - "3306:3306" volumes: - - ./mariadb:/var/lib/mysql:Z + - mariadb:/var/lib/mysql:Z healthcheck: test: ["CMD", "mariadb-admin", "ping", "-h", "localhost", "-uroot", "-prootpassword"] interval: 10s @@ -52,3 +52,6 @@ services: db: condition: service_healthy restart: true + +volumes: + mariadb: \ No newline at end of file diff --git a/get_rate.sh b/get_rate.sh deleted file mode 100644 index a09659d..0000000 --- a/get_rate.sh +++ /dev/null @@ -1,5 +0,0 @@ -before=$(ls migrations | wc -l) -sleep 60 -after=$(ls migrations | wc -l) -let dif=after-before -echo "$dif" \ No newline at end of file diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000..d980a0e --- /dev/null +++ b/renovate.json @@ -0,0 +1,7 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:recommended" + ], + "forkProcessing": "enabled" +}