From 0e8abbca047efbe9e2b02b641336f16cd54afa1a Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sat, 29 Jan 2022 23:10:32 +0100 Subject: [PATCH 01/24] rename db files --- misc/database/tables/{map.sql => 01_map.sql} | 0 .../tables/{marker.sql => 02_marker.sql} | 0 ...dress_type.sql => 03_ogn_address_type.sql} | 0 ...raft_type.sql => 04_ogn_aircraft_type.sql} | 0 .../{ogn_device.sql => 05_ogn_device.sql} | 0 ..._station.sql => 06_ogn_hidden_station.sql} | 0 .../{packet_type.sql => 07_packet_type.sql} | 0 .../tables/{sender.sql => 08_sender.sql} | 0 .../tables/{source.sql => 09_source.sql} | 0 .../{station_type.sql => 10_station_type.sql} | 0 .../tables/{station.sql => 11_station.sql} | 0 ...bits.sql => 12_station_telemetry_bits.sql} | 0 ...eqns.sql => 13_station_telemetry_eqns.sql} | 0 ...ram.sql => 14_station_telemetry_param.sql} | 0 ...unit.sql => 15_station_telemetry_unit.sql} | 0 .../tables/{packet.sql => 16_packet.sql} | 0 ...cket_weather.sql => 17_packet_weather.sql} | 0 ..._telemetry.sql => 18_packet_telemetry.sql} | 0 .../{packet_path.sql => 19_packet_path.sql} | 0 .../{packet_ogn.sql => 20_packet_ogn.sql} | 0 server/scripts/db_setup.sh | 40 +++++++++---------- 21 files changed, 20 insertions(+), 20 deletions(-) rename misc/database/tables/{map.sql => 01_map.sql} (100%) rename misc/database/tables/{marker.sql => 02_marker.sql} (100%) rename misc/database/tables/{ogn_address_type.sql => 03_ogn_address_type.sql} (100%) rename misc/database/tables/{ogn_aircraft_type.sql => 04_ogn_aircraft_type.sql} (100%) rename misc/database/tables/{ogn_device.sql => 05_ogn_device.sql} (100%) rename misc/database/tables/{ogn_hidden_station.sql => 06_ogn_hidden_station.sql} (100%) rename misc/database/tables/{packet_type.sql => 07_packet_type.sql} (100%) rename misc/database/tables/{sender.sql => 08_sender.sql} (100%) rename misc/database/tables/{source.sql => 09_source.sql} (100%) rename misc/database/tables/{station_type.sql => 10_station_type.sql} (100%) rename misc/database/tables/{station.sql => 11_station.sql} (100%) rename misc/database/tables/{station_telemetry_bits.sql => 12_station_telemetry_bits.sql} (100%) rename misc/database/tables/{station_telemetry_eqns.sql => 13_station_telemetry_eqns.sql} (100%) rename misc/database/tables/{station_telemetry_param.sql => 14_station_telemetry_param.sql} (100%) rename misc/database/tables/{station_telemetry_unit.sql => 15_station_telemetry_unit.sql} (100%) rename misc/database/tables/{packet.sql => 16_packet.sql} (100%) rename misc/database/tables/{packet_weather.sql => 17_packet_weather.sql} (100%) rename misc/database/tables/{packet_telemetry.sql => 18_packet_telemetry.sql} (100%) rename misc/database/tables/{packet_path.sql => 19_packet_path.sql} (100%) rename misc/database/tables/{packet_ogn.sql => 20_packet_ogn.sql} (100%) diff --git a/misc/database/tables/map.sql b/misc/database/tables/01_map.sql similarity index 100% rename from misc/database/tables/map.sql rename to misc/database/tables/01_map.sql diff --git a/misc/database/tables/marker.sql b/misc/database/tables/02_marker.sql similarity index 100% rename from misc/database/tables/marker.sql rename to misc/database/tables/02_marker.sql diff --git a/misc/database/tables/ogn_address_type.sql b/misc/database/tables/03_ogn_address_type.sql similarity index 100% rename from misc/database/tables/ogn_address_type.sql rename to misc/database/tables/03_ogn_address_type.sql diff --git a/misc/database/tables/ogn_aircraft_type.sql b/misc/database/tables/04_ogn_aircraft_type.sql similarity index 100% rename from misc/database/tables/ogn_aircraft_type.sql rename to misc/database/tables/04_ogn_aircraft_type.sql diff --git a/misc/database/tables/ogn_device.sql b/misc/database/tables/05_ogn_device.sql similarity index 100% rename from misc/database/tables/ogn_device.sql rename to misc/database/tables/05_ogn_device.sql diff --git a/misc/database/tables/ogn_hidden_station.sql b/misc/database/tables/06_ogn_hidden_station.sql similarity index 100% rename from misc/database/tables/ogn_hidden_station.sql rename to misc/database/tables/06_ogn_hidden_station.sql diff --git a/misc/database/tables/packet_type.sql b/misc/database/tables/07_packet_type.sql similarity index 100% rename from misc/database/tables/packet_type.sql rename to misc/database/tables/07_packet_type.sql diff --git a/misc/database/tables/sender.sql b/misc/database/tables/08_sender.sql similarity index 100% rename from misc/database/tables/sender.sql rename to misc/database/tables/08_sender.sql diff --git a/misc/database/tables/source.sql b/misc/database/tables/09_source.sql similarity index 100% rename from misc/database/tables/source.sql rename to misc/database/tables/09_source.sql diff --git a/misc/database/tables/station_type.sql b/misc/database/tables/10_station_type.sql similarity index 100% rename from misc/database/tables/station_type.sql rename to misc/database/tables/10_station_type.sql diff --git a/misc/database/tables/station.sql b/misc/database/tables/11_station.sql similarity index 100% rename from misc/database/tables/station.sql rename to misc/database/tables/11_station.sql diff --git a/misc/database/tables/station_telemetry_bits.sql b/misc/database/tables/12_station_telemetry_bits.sql similarity index 100% rename from misc/database/tables/station_telemetry_bits.sql rename to misc/database/tables/12_station_telemetry_bits.sql diff --git a/misc/database/tables/station_telemetry_eqns.sql b/misc/database/tables/13_station_telemetry_eqns.sql similarity index 100% rename from misc/database/tables/station_telemetry_eqns.sql rename to misc/database/tables/13_station_telemetry_eqns.sql diff --git a/misc/database/tables/station_telemetry_param.sql b/misc/database/tables/14_station_telemetry_param.sql similarity index 100% rename from misc/database/tables/station_telemetry_param.sql rename to misc/database/tables/14_station_telemetry_param.sql diff --git a/misc/database/tables/station_telemetry_unit.sql b/misc/database/tables/15_station_telemetry_unit.sql similarity index 100% rename from misc/database/tables/station_telemetry_unit.sql rename to misc/database/tables/15_station_telemetry_unit.sql diff --git a/misc/database/tables/packet.sql b/misc/database/tables/16_packet.sql similarity index 100% rename from misc/database/tables/packet.sql rename to misc/database/tables/16_packet.sql diff --git a/misc/database/tables/packet_weather.sql b/misc/database/tables/17_packet_weather.sql similarity index 100% rename from misc/database/tables/packet_weather.sql rename to misc/database/tables/17_packet_weather.sql diff --git a/misc/database/tables/packet_telemetry.sql b/misc/database/tables/18_packet_telemetry.sql similarity index 100% rename from misc/database/tables/packet_telemetry.sql rename to misc/database/tables/18_packet_telemetry.sql diff --git a/misc/database/tables/packet_path.sql b/misc/database/tables/19_packet_path.sql similarity index 100% rename from misc/database/tables/packet_path.sql rename to misc/database/tables/19_packet_path.sql diff --git a/misc/database/tables/packet_ogn.sql b/misc/database/tables/20_packet_ogn.sql similarity index 100% rename from misc/database/tables/packet_ogn.sql rename to misc/database/tables/20_packet_ogn.sql diff --git a/server/scripts/db_setup.sh b/server/scripts/db_setup.sh index 35404f4..acea663 100755 --- a/server/scripts/db_setup.sh +++ b/server/scripts/db_setup.sh @@ -15,26 +15,26 @@ psql -p $PORT $DATABASE << EOF begin transaction; -\i $SQLPATH/map.sql -\i $SQLPATH/marker.sql -\i $SQLPATH/ogn_address_type.sql -\i $SQLPATH/ogn_aircraft_type.sql -\i $SQLPATH/ogn_device.sql -\i $SQLPATH/ogn_hidden_station.sql -\i $SQLPATH/packet_type.sql -\i $SQLPATH/sender.sql -\i $SQLPATH/source.sql -\i $SQLPATH/station_type.sql -\i $SQLPATH/station.sql -\i $SQLPATH/station_telemetry_bits.sql -\i $SQLPATH/station_telemetry_eqns.sql -\i $SQLPATH/station_telemetry_param.sql -\i $SQLPATH/station_telemetry_unit.sql -\i $SQLPATH/packet.sql -\i $SQLPATH/packet_weather.sql -\i $SQLPATH/packet_telemetry.sql -\i $SQLPATH/packet_path.sql -\i $SQLPATH/packet_ogn.sql +\i $SQLPATH/01_map.sql +\i $SQLPATH/02_marker.sql +\i $SQLPATH/03_ogn_address_type.sql +\i $SQLPATH/04_ogn_aircraft_type.sql +\i $SQLPATH/05_ogn_device.sql +\i $SQLPATH/06_ogn_hidden_station.sql +\i $SQLPATH/07_packet_type.sql +\i $SQLPATH/08_sender.sql +\i $SQLPATH/09_source.sql +\i $SQLPATH/10_station_type.sql +\i $SQLPATH/11_station.sql +\i $SQLPATH/12_station_telemetry_bits.sql +\i $SQLPATH/13_station_telemetry_eqns.sql +\i $SQLPATH/14_station_telemetry_param.sql +\i $SQLPATH/15_station_telemetry_unit.sql +\i $SQLPATH/16_packet.sql +\i $SQLPATH/17_packet_weather.sql +\i $SQLPATH/18_packet_telemetry.sql +\i $SQLPATH/19_packet_path.sql +\i $SQLPATH/20_packet_ogn.sql commit; From 4e4acca6dec4569028197f60848487a6cccd709c Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sat, 29 Jan 2022 23:13:12 +0100 Subject: [PATCH 02/24] move/add config files to config folder --- config/000-default.conf | 13 +++++++++++++ {misc => config}/aprsc.conf | 2 -- config/trackdirect.ini | 6 +++--- 3 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 config/000-default.conf rename {misc => config}/aprsc.conf (97%) diff --git a/config/000-default.conf b/config/000-default.conf new file mode 100644 index 0000000..575aefe --- /dev/null +++ b/config/000-default.conf @@ -0,0 +1,13 @@ + + ServerAdmin webmaster@localhost + DocumentRoot /root/trackdirect/htdocs/public + + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + + + + Options Indexes MultiViews + AllowOverride All + Require all granted + diff --git a/misc/aprsc.conf b/config/aprsc.conf similarity index 97% rename from misc/aprsc.conf rename to config/aprsc.conf index b8aa71d..dec056d 100755 --- a/misc/aprsc.conf +++ b/config/aprsc.conf @@ -27,5 +27,3 @@ HTTPStatusOptions ShowEmail=1 # After configuring the rest of the settings, remove this bad command # from the configuration file. It's here only to avoid starting the # server up accidentally with an invalid configuration. -MagicBadness 42.7 - diff --git a/config/trackdirect.ini b/config/trackdirect.ini index ba50fed..62d2cfe 100644 --- a/config/trackdirect.ini +++ b/config/trackdirect.ini @@ -5,9 +5,9 @@ [database] ;; Basic database settings -host="127.0.0.1" +host="db" database="trackdirect" -;username="username" +username="root" password="foobar" port="5432" @@ -74,7 +74,7 @@ max_queued_realtime_packets="30" [collector0] -host="127.0.0.1" +host="aprsc" port_full="10152" port_filtered="14580" From fb9508d61a5dac8530c16b36b0481a91621939cb Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sat, 29 Jan 2022 23:14:46 +0100 Subject: [PATCH 03/24] change processes to blocking mode --- server/bin/wsserver.py | 2 +- server/scripts/collector.sh | 2 +- server/scripts/heatmapcreator.sh | 2 +- server/scripts/remover.sh | 2 +- server/scripts/stationremover.sh | 2 +- server/scripts/wsserver.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/bin/wsserver.py b/server/bin/wsserver.py index d60674e..024125d 100644 --- a/server/bin/wsserver.py +++ b/server/bin/wsserver.py @@ -47,7 +47,7 @@ def master(options, trackDirectLogger): childFDs={0: 0, 1: 1, 2: 2, port.fileno(): port.fileno()}, env=os.environ) - # reactor.run() + reactor.run() except Exception as e: trackDirectLogger.error(e, exc_info=1) diff --git a/server/scripts/collector.sh b/server/scripts/collector.sh index c9d4bba..1abf8b9 100755 --- a/server/scripts/collector.sh +++ b/server/scripts/collector.sh @@ -17,6 +17,6 @@ else export PYTHONPATH=$PYTHONPATH:$CURRENTDIR/../trackdirect:$CURRENTDIR/../../heatmap-2.2.1/ cd $CURRENTDIR/.. - python2 ./bin/collector.py $CONFIGFILE $COLLECTORNUMBER 2>&1 & + python2 ./bin/collector.py $CONFIGFILE $COLLECTORNUMBER exit 0 fi diff --git a/server/scripts/heatmapcreator.sh b/server/scripts/heatmapcreator.sh index f084b19..e53e055 100755 --- a/server/scripts/heatmapcreator.sh +++ b/server/scripts/heatmapcreator.sh @@ -17,6 +17,6 @@ else export PYTHONPATH=$PYTHONPATH:$CURRENTDIR/../trackdirect:$CURRENTDIR/../../heatmap-2.2.1/ cd $CURRENTDIR/.. - python2 $CURRENTDIR/../bin/heatmapcreator.py $CONFIGFILE $DESTDIR 2>&1 & + python2 $CURRENTDIR/../bin/heatmapcreator.py $CONFIGFILE $DESTDIR exit 0 fi diff --git a/server/scripts/remover.sh b/server/scripts/remover.sh index 0bf96a3..c507a85 100755 --- a/server/scripts/remover.sh +++ b/server/scripts/remover.sh @@ -16,6 +16,6 @@ else export PYTHONPATH=$PYTHONPATH:$CURRENTDIR/../trackdirect:$CURRENTDIR/../../heatmap-2.2.1/ cd $CURRENTDIR/.. - python2 $CURRENTDIR/../bin/remover.py $CONFIGFILE 2>&1 & + python2 $CURRENTDIR/../bin/remover.py $CONFIGFILE exit 0 fi diff --git a/server/scripts/stationremover.sh b/server/scripts/stationremover.sh index 80aa18b..e9676ff 100755 --- a/server/scripts/stationremover.sh +++ b/server/scripts/stationremover.sh @@ -17,6 +17,6 @@ else export PYTHONPATH=$PYTHONPATH:$CURRENTDIR/../trackdirect:$CURRENTDIR/../../heatmap-2.2.1/ cd $CURRENTDIR/.. - python2 $CURRENTDIR/../bin/stationremover.py $CONFIGFILE $STATIONID 2>&1 & + python2 $CURRENTDIR/../bin/stationremover.py $CONFIGFILE $STATIONID exit 0 fi diff --git a/server/scripts/wsserver.sh b/server/scripts/wsserver.sh index 322981b..974fe82 100755 --- a/server/scripts/wsserver.sh +++ b/server/scripts/wsserver.sh @@ -15,6 +15,6 @@ else export PYTHONPATH=$PYTHONPATH:$CURRENTDIR/../trackdirect:$CURRENTDIR/../../heatmap-2.2.1/ cd $CURRENTDIR/.. - python2 $CURRENTDIR/../bin/wsserver.py --config $CONFIGFILE 2>&1 & + python2 $CURRENTDIR/../bin/wsserver.py --config $CONFIGFILE exit 0 fi From 45796ff6faee2f28283c53f3723d8a8710cc3da6 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sat, 29 Jan 2022 23:15:17 +0100 Subject: [PATCH 04/24] add heatmaps folder to docker-/git-ignore --- .dockerignore | 1 + .gitignore | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..c0fac51 --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +heatmaps diff --git a/.gitignore b/.gitignore index d4b8191..a7d6a15 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ config/* !config/trackdirect.ini ogndevices + +heatmaps From fc9e921671a67a4a68ba70359ba10c6c2d5f01d7 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sat, 29 Jan 2022 23:24:53 +0100 Subject: [PATCH 05/24] add docker and docker-compose files --- aprsc.dockerfile | 23 +++++++++++ db.dockerfile | 2 + docker-compose.yml | 75 ++++++++++++++++++++++++++++++++++ trackdirect-apache.dockerfile | 24 +++++++++++ trackdirect-python2.dockerfile | 21 ++++++++++ 5 files changed, 145 insertions(+) create mode 100644 aprsc.dockerfile create mode 100644 db.dockerfile create mode 100644 docker-compose.yml create mode 100644 trackdirect-apache.dockerfile create mode 100644 trackdirect-python2.dockerfile diff --git a/aprsc.dockerfile b/aprsc.dockerfile new file mode 100644 index 0000000..0dc0317 --- /dev/null +++ b/aprsc.dockerfile @@ -0,0 +1,23 @@ +FROM ubuntu:20.04 + +RUN apt-get update && apt-get install -y \ + gnupg \ + && rm -rf /var/lib/apt/lists/* + +RUN printf "deb http://aprsc-dist.he.fi/aprsc/apt focal main" >> /etc/apt/sources.list +RUN gpg --keyserver keyserver.ubuntu.com --recv C51AA22389B5B74C3896EF3CA72A581E657A2B8D +RUN gpg --export C51AA22389B5B74C3896EF3CA72A581E657A2B8D | apt-key add - + +RUN apt-get update && apt-get install -y \ + aprsc \ + && rm -rf /var/lib/apt/lists/* + +RUN rm /opt/aprsc/etc/aprsc.conf +VOLUME /opt/aprsc/etc/aprsc.conf + +EXPOSE 10152 +EXPOSE 14580 +EXPOSE 10155 +EXPOSE 14501 + +CMD /opt/aprsc/sbin/aprsc -u aprsc -t /opt/aprsc -c /etc/aprsc.conf diff --git a/db.dockerfile b/db.dockerfile new file mode 100644 index 0000000..332aefa --- /dev/null +++ b/db.dockerfile @@ -0,0 +1,2 @@ +FROM postgres +COPY misc/database/tables/* /docker-entrypoint-initdb.d/ diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..2935581 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,75 @@ +version: "3.9" +services: + aprsc: + build: + context: . + dockerfile: aprsc.dockerfile + restart: always + ports: + - "10152:10152" + - "14580:14580" + - "10155:10155" + - "14501:14501" + volumes: + - $PWD/config/aprsc.conf:/opt/aprsc/etc/aprsc.conf + + collector: + build: + context: . + dockerfile: trackdirect-python2.dockerfile + restart: always + volumes: + - $PWD/config/trackdirect.ini:/root/trackdirect/config/trackdirect.ini + command: /root/trackdirect/server/scripts/collector.sh trackdirect.ini 0 + depends_on: + - "db" + - "aprsc" + + websocket: + build: + context: . + dockerfile: trackdirect-python2.dockerfile + restart: always + volumes: + - $PWD/config/trackdirect.ini:/root/trackdirect/config/trackdirect.ini + command: /root/trackdirect/server/scripts/wsserver.sh trackdirect.ini + ports: + - "9000:9000" + depends_on: + - "db" + - "aprsc" + + heatmaps: + build: + context: . + dockerfile: trackdirect-python2.dockerfile + restart: always + volumes: + - $PWD/config/trackdirect.ini:/root/trackdirect/config/trackdirect.ini + - $PWD/heatmaps:/root/trackdirect/htdocs/public/heatmaps + command: /root/trackdirect/server/scripts/heatmapcreator.sh trackdirect.ini /root/trackdirect/htdocs/public/heatmaps + depends_on: + - "db" + + web: + build: + context: . + dockerfile: trackdirect-apache.dockerfile + restart: always + volumes: + - $PWD/config/trackdirect.ini:/root/trackdirect/config/trackdirect.ini + - $PWD/heatmaps:/root/trackdirect/htdocs/public/heatmaps + ports: + - "80:80" + depends_on: + - "db" + + db: + build: + context: . + dockerfile: db.dockerfile + restart: always + environment: + POSTGRES_USER: root + POSTGRES_PASSWORD: foobar + POSTGRES_DB: trackdirect diff --git a/trackdirect-apache.dockerfile b/trackdirect-apache.dockerfile new file mode 100644 index 0000000..c8309c8 --- /dev/null +++ b/trackdirect-apache.dockerfile @@ -0,0 +1,24 @@ +FROM php:7.2-apache + +RUN apt-get update && apt-get install -y \ + git \ + libpq-dev \ + postgresql-client-common \ + postgresql-client \ + libevent-dev \ + libmagickwand-dev \ + imagemagick \ + inkscape \ + && rm -rf /var/lib/apt/lists/* + +RUN pecl install imagick && docker-php-ext-enable imagick && docker-php-ext-install pdo pdo_pgsql + +COPY . /root/trackdirect +COPY config/000-default.conf /etc/apache2/sites-enabled/ + +RUN a2enmod rewrite +RUN chmod a+rx / && chmod a+rx -R /root +RUN chmod 777 /root/trackdirect/htdocs/public/symbols + +VOLUME /root/trackdirect/config/trackdirect.ini +VOLUME /root/trackdirect/htdocs/public/heatmaps diff --git a/trackdirect-python2.dockerfile b/trackdirect-python2.dockerfile new file mode 100644 index 0000000..b3acf7c --- /dev/null +++ b/trackdirect-python2.dockerfile @@ -0,0 +1,21 @@ +FROM ubuntu:20.04 + +RUN apt-get update && apt-get install -y \ + python2 \ + python2-dev \ + git \ + curl \ + wget \ + gcc \ + && rm -rf /var/lib/apt/lists/* + +RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py && python2 get-pip.py +RUN pip2 install psycopg2-binary autobahn[twisted] twisted pympler image_slicer jsmin psutil + +RUN git clone https://github.com/rossengeorgiev/aprs-python && cd aprs-python && pip2 install . +RUN wget http://jjguy.com/heatmap/heatmap-2.2.1.tar.gz && tar xzf heatmap-2.2.1.tar.gz && cd heatmap-2.2.1 && python2 setup.py install + +COPY . /root/trackdirect + +VOLUME /root/trackdirect/config/trackdirect.ini +VOLUME /root/trackdirect/htdocs/public/heatmaps From aa1434faf8b1e33dc5810bf15f699ff62da3d93b Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sun, 30 Jan 2022 23:22:56 +0100 Subject: [PATCH 06/24] add image build --- .github/workflows/image_build.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/image_build.yml diff --git a/.github/workflows/image_build.yml b/.github/workflows/image_build.yml new file mode 100644 index 0000000..83862a8 --- /dev/null +++ b/.github/workflows/image_build.yml @@ -0,0 +1,31 @@ +name: "Docker image build" + +#on: +# push: +# branches: +# - 'main' + +on: [push, pull_request] + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 +# - name: Set up QEMU +# uses: docker/setup-qemu-action@v1 +# - name: Set up Docker Buildx +# uses: docker/setup-buildx-action@v1 +# - name: Login to DockerHub +# uses: docker/login-action@v1 +# with: +# username: ${{ secrets.DOCKERHUB_USERNAME }} +# password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Build and push + uses: docker/build-push-action@v2 + with: + context: . + dockerfile: aprsc.dockerfile + push: true + tags: peterus/trackdirect:aprsc From 8531feab5a656ef84529e700c500f2c6d24f5a64 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sun, 30 Jan 2022 23:26:21 +0100 Subject: [PATCH 07/24] change file-argument --- .github/workflows/image_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/image_build.yml b/.github/workflows/image_build.yml index 83862a8..f890dcb 100644 --- a/.github/workflows/image_build.yml +++ b/.github/workflows/image_build.yml @@ -26,6 +26,6 @@ jobs: uses: docker/build-push-action@v2 with: context: . - dockerfile: aprsc.dockerfile + file: aprsc.dockerfile push: true tags: peterus/trackdirect:aprsc From 7240569a87ff2321540c34fcb945cb650fb15b37 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sun, 30 Jan 2022 23:28:24 +0100 Subject: [PATCH 08/24] add login to dockerhub --- .github/workflows/image_build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/image_build.yml b/.github/workflows/image_build.yml index f890dcb..96b476b 100644 --- a/.github/workflows/image_build.yml +++ b/.github/workflows/image_build.yml @@ -17,11 +17,11 @@ jobs: # uses: docker/setup-qemu-action@v1 # - name: Set up Docker Buildx # uses: docker/setup-buildx-action@v1 -# - name: Login to DockerHub -# uses: docker/login-action@v1 -# with: -# username: ${{ secrets.DOCKERHUB_USERNAME }} -# password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push uses: docker/build-push-action@v2 with: From 99eaac3ef3a9a6763fd0bea5c3e1c171177484d1 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sun, 30 Jan 2022 23:37:36 +0100 Subject: [PATCH 09/24] login into github container reg --- .github/workflows/image_build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/image_build.yml b/.github/workflows/image_build.yml index 96b476b..89613d8 100644 --- a/.github/workflows/image_build.yml +++ b/.github/workflows/image_build.yml @@ -17,11 +17,12 @@ jobs: # uses: docker/setup-qemu-action@v1 # - name: Set up Docker Buildx # uses: docker/setup-buildx-action@v1 - - name: Login to DockerHub + - name: Login to GitHub Container Registry uses: docker/login-action@v1 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push uses: docker/build-push-action@v2 with: From 74808083136f16e43188cf32d0a5a3742a449296 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sun, 30 Jan 2022 23:47:06 +0100 Subject: [PATCH 10/24] docker push update --- .github/workflows/image_build.yml | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/.github/workflows/image_build.yml b/.github/workflows/image_build.yml index 89613d8..7c5e73f 100644 --- a/.github/workflows/image_build.yml +++ b/.github/workflows/image_build.yml @@ -1,4 +1,4 @@ -name: "Docker image build" +name: Create and publish a Docker image #on: # push: @@ -7,26 +7,35 @@ name: "Docker image build" on: [push, pull_request] +env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + jobs: docker: runs-on: ubuntu-latest + permissions: + contents: read + packages: write steps: - - name: Checkout + - name: Checkout repository uses: actions/checkout@v2 -# - name: Set up QEMU -# uses: docker/setup-qemu-action@v1 -# - name: Set up Docker Buildx -# uses: docker/setup-buildx-action@v1 - name: Login to GitHub Container Registry uses: docker/login-action@v1 with: - registry: ghcr.io + registry: ${{ env.REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Build and push + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v3 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + - name: Build and push Docker image uses: docker/build-push-action@v2 with: context: . file: aprsc.dockerfile push: true - tags: peterus/trackdirect:aprsc + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} From 609cc7daf6744a20ea24c554d02701d1d2f49464 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sun, 30 Jan 2022 23:51:19 +0100 Subject: [PATCH 11/24] add aprsc tag --- .github/workflows/image_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/image_build.yml b/.github/workflows/image_build.yml index 7c5e73f..c442e24 100644 --- a/.github/workflows/image_build.yml +++ b/.github/workflows/image_build.yml @@ -37,5 +37,5 @@ jobs: context: . file: aprsc.dockerfile push: true - tags: ${{ steps.meta.outputs.tags }} + tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:aprsc labels: ${{ steps.meta.outputs.labels }} From 2d6d533142081536cc0afd40a172de4b0e198468 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sun, 30 Jan 2022 23:55:20 +0100 Subject: [PATCH 12/24] add the rest of the docker images --- .github/workflows/image_build.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.github/workflows/image_build.yml b/.github/workflows/image_build.yml index c442e24..6105611 100644 --- a/.github/workflows/image_build.yml +++ b/.github/workflows/image_build.yml @@ -39,3 +39,27 @@ jobs: push: true tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:aprsc labels: ${{ steps.meta.outputs.labels }} + - name: Build and push Docker image + uses: docker/build-push-action@v2 + with: + context: . + file: db.dockerfile + push: true + tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:db + labels: ${{ steps.meta.outputs.labels }} + - name: Build and push Docker image + uses: docker/build-push-action@v2 + with: + context: . + file: trackdirect-apache.dockerfile + push: true + tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:trackdirect-apache + labels: ${{ steps.meta.outputs.labels }} + - name: Build and push Docker image + uses: docker/build-push-action@v2 + with: + context: . + file: trackdirect-python2.dockerfile + push: true + tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:trackdirect-python2 + labels: ${{ steps.meta.outputs.labels }} From da50871df5eada5d6e013bfeba3cd71a0b815ed9 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Mon, 31 Jan 2022 22:23:23 +0100 Subject: [PATCH 13/24] upload docker images to dockerhub --- .github/workflows/image_build.yml | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/.github/workflows/image_build.yml b/.github/workflows/image_build.yml index 6105611..49e8561 100644 --- a/.github/workflows/image_build.yml +++ b/.github/workflows/image_build.yml @@ -20,46 +20,36 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v2 - - name: Login to GitHub Container Registry + - name: Login to Docker Hub uses: docker/login-action@v1 with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@v3 - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push Docker image uses: docker/build-push-action@v2 with: context: . file: aprsc.dockerfile push: true - tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:aprsc - labels: ${{ steps.meta.outputs.labels }} + tags: ${{ secrets.DOCKERHUB_USERNAME }}/aprsc:latest - name: Build and push Docker image uses: docker/build-push-action@v2 with: context: . file: db.dockerfile push: true - tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:db - labels: ${{ steps.meta.outputs.labels }} + tags: ${{ secrets.DOCKERHUB_USERNAME }}/trackdirect-db:latest - name: Build and push Docker image uses: docker/build-push-action@v2 with: context: . file: trackdirect-apache.dockerfile push: true - tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:trackdirect-apache - labels: ${{ steps.meta.outputs.labels }} + tags: ${{ secrets.DOCKERHUB_USERNAME }}/trackdirect-apache:latest - name: Build and push Docker image uses: docker/build-push-action@v2 with: context: . file: trackdirect-python2.dockerfile push: true - tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:trackdirect-python2 - labels: ${{ steps.meta.outputs.labels }} + tags: ${{ secrets.DOCKERHUB_USERNAME }}/trackdirect-python2:latest From 9afe148228533135ff8a0d84b1979c10d9e17fec Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Mon, 31 Jan 2022 22:37:05 +0100 Subject: [PATCH 14/24] try to upload docker image --- .github/workflows/image_build.yml | 52 ++++++++++++++----------------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/.github/workflows/image_build.yml b/.github/workflows/image_build.yml index 49e8561..a36e85f 100644 --- a/.github/workflows/image_build.yml +++ b/.github/workflows/image_build.yml @@ -7,16 +7,9 @@ name: Create and publish a Docker image on: [push, pull_request] -env: - REGISTRY: ghcr.io - IMAGE_NAME: ${{ github.repository }} - jobs: docker: runs-on: ubuntu-latest - permissions: - contents: read - packages: write steps: - name: Checkout repository uses: actions/checkout@v2 @@ -31,25 +24,26 @@ jobs: context: . file: aprsc.dockerfile push: true - tags: ${{ secrets.DOCKERHUB_USERNAME }}/aprsc:latest - - name: Build and push Docker image - uses: docker/build-push-action@v2 - with: - context: . - file: db.dockerfile - push: true - tags: ${{ secrets.DOCKERHUB_USERNAME }}/trackdirect-db:latest - - name: Build and push Docker image - uses: docker/build-push-action@v2 - with: - context: . - file: trackdirect-apache.dockerfile - push: true - tags: ${{ secrets.DOCKERHUB_USERNAME }}/trackdirect-apache:latest - - name: Build and push Docker image - uses: docker/build-push-action@v2 - with: - context: . - file: trackdirect-python2.dockerfile - push: true - tags: ${{ secrets.DOCKERHUB_USERNAME }}/trackdirect-python2:latest + tags: peterus/aprsc +# - name: Build and push Docker image +# uses: docker/build-push-action@v2 +# with: +# context: . +# file: db.dockerfile +# push: true +# tags: ${{ secrets.DOCKERHUB_USERNAME }}/trackdirect-db:latest +# - name: Build and push Docker image +# uses: docker/build-push-action@v2 +# with: +# context: . +# file: trackdirect-apache.dockerfile +# push: true +# tags: ${{ secrets.DOCKERHUB_USERNAME }}/trackdirect-apache:latest +# - name: Build and push Docker image +# uses: docker/build-push-action@v2 +# with: +# context: . +# file: trackdirect-python2.dockerfile +# push: true +# tags: ${{ secrets.DOCKERHUB_USERNAME }}/trackdirect-python2:latest +# From b117f9b6770b89b5b0ebd0b5710ff9bb41478756 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Mon, 31 Jan 2022 22:45:10 +0100 Subject: [PATCH 15/24] lets try this upload --- .github/workflows/image_build.yml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/image_build.yml b/.github/workflows/image_build.yml index a36e85f..931a4cc 100644 --- a/.github/workflows/image_build.yml +++ b/.github/workflows/image_build.yml @@ -13,18 +13,15 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v2 - - name: Login to Docker Hub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Build and push Docker image - uses: docker/build-push-action@v2 - with: - context: . - file: aprsc.dockerfile - push: true - tags: peterus/aprsc + - name: docker hub login + env: + DOCKER_USER: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }} + run: docker login -u $DOCKER_USER -p $DOCKER_PASSWORD + - name: Build the aprsc image + run: docker build . --file aprsc.dockerfile --tag peterus/aprsc:latest + - name: Docker Push + run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/aprsc:latest # - name: Build and push Docker image # uses: docker/build-push-action@v2 # with: From 7fa3d7075e9b185980273e8365067c7671178efe Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Tue, 1 Feb 2022 21:11:43 +0100 Subject: [PATCH 16/24] delete workflow --- .github/workflows/image_build.yml | 46 ------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 .github/workflows/image_build.yml diff --git a/.github/workflows/image_build.yml b/.github/workflows/image_build.yml deleted file mode 100644 index 931a4cc..0000000 --- a/.github/workflows/image_build.yml +++ /dev/null @@ -1,46 +0,0 @@ -name: Create and publish a Docker image - -#on: -# push: -# branches: -# - 'main' - -on: [push, pull_request] - -jobs: - docker: - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - name: docker hub login - env: - DOCKER_USER: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }} - run: docker login -u $DOCKER_USER -p $DOCKER_PASSWORD - - name: Build the aprsc image - run: docker build . --file aprsc.dockerfile --tag peterus/aprsc:latest - - name: Docker Push - run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/aprsc:latest -# - name: Build and push Docker image -# uses: docker/build-push-action@v2 -# with: -# context: . -# file: db.dockerfile -# push: true -# tags: ${{ secrets.DOCKERHUB_USERNAME }}/trackdirect-db:latest -# - name: Build and push Docker image -# uses: docker/build-push-action@v2 -# with: -# context: . -# file: trackdirect-apache.dockerfile -# push: true -# tags: ${{ secrets.DOCKERHUB_USERNAME }}/trackdirect-apache:latest -# - name: Build and push Docker image -# uses: docker/build-push-action@v2 -# with: -# context: . -# file: trackdirect-python2.dockerfile -# push: true -# tags: ${{ secrets.DOCKERHUB_USERNAME }}/trackdirect-python2:latest -# From 0462ef45c15d7b1a980b67739dc49e89cbb3f94d Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Tue, 1 Feb 2022 21:26:41 +0100 Subject: [PATCH 17/24] add volume to db image --- .dockerignore | 1 + .gitignore | 2 ++ db.dockerfile | 1 + docker-compose.yml | 2 ++ 4 files changed, 6 insertions(+) diff --git a/.dockerignore b/.dockerignore index c0fac51..0f69a22 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1,2 @@ heatmaps +db diff --git a/.gitignore b/.gitignore index a7d6a15..bd34fd2 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ config/* ogndevices heatmaps + +db diff --git a/db.dockerfile b/db.dockerfile index 332aefa..4d03786 100644 --- a/db.dockerfile +++ b/db.dockerfile @@ -1,2 +1,3 @@ FROM postgres COPY misc/database/tables/* /docker-entrypoint-initdb.d/ +VOLUME /var/lib/postgresql/data diff --git a/docker-compose.yml b/docker-compose.yml index 2935581..fa3b770 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -73,3 +73,5 @@ services: POSTGRES_USER: root POSTGRES_PASSWORD: foobar POSTGRES_DB: trackdirect + volumes: + - $PWD/db:/var/lib/postgresql/data From 26fc5b1fd970eed34e15bfb5465c81363794b3d8 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Fri, 4 Feb 2022 21:26:09 +0100 Subject: [PATCH 18/24] add release docker-compose and readme. --- README.md | 29 +++++++++++++++++++ docker-compose-rel.yml | 65 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 docker-compose-rel.yml diff --git a/README.md b/README.md index 0247f42..8ad1365 100644 --- a/README.md +++ b/README.md @@ -252,6 +252,35 @@ Crontab example ### Server Requirements How powerful server you need depends on what type of data source you are going to use. If you, for example, receive data from the APRS-IS network, you will probably need at least a server with 4 CPUs and 8 GB of RAM, but I recommend using a server with 8 CPUs and 16 GB of RAM. + +## Getting Started - Docker +There is everything prepared to run trackdirect inside of some docker containers. As there is a Docker-Compose file the setup is very simple and fast. + +### Install Docker and Docker-Compose +Install [docker](https://docs.docker.com/get-docker/) and [docker-compose](https://docs.docker.com/compose/install/) from the published websites. + +### Config file +Adopt your config in `config/aprsc.conf` and `config/trackdirect.ini`. + + +### Run Docker-Compose for development containers +To startup trackdirect in an development container run this docker-compose command: + +``` +docker-compose up +``` + +If you want to run the container in daemon mode add `-d` to the command. + +### Run Docker-Compose for the last published docker images + +@peterus is creating regular docker images from this repository. With the release Docker-Compose file you do not need to install and compile everything by your own. + +``` +docker-compose -f docker-compose-rel.yml up +``` + + ## TODO - Rewrite backend to use Python 3 instead of Python 2. - Create a REST-API and replace the current website example with a new frontend written in Angular. diff --git a/docker-compose-rel.yml b/docker-compose-rel.yml new file mode 100644 index 0000000..d0aa308 --- /dev/null +++ b/docker-compose-rel.yml @@ -0,0 +1,65 @@ +version: "3.9" +services: + aprsc: + image: peterus/aprsc:latest + restart: always + ports: + - "10152:10152" + - "14580:14580" + - "10155:10155" + - "14501:14501" + volumes: + - $PWD/config/aprsc.conf:/opt/aprsc/etc/aprsc.conf + + collector: + image: peterus/trackdirect-python2:latest + restart: always + volumes: + - $PWD/config/trackdirect.ini:/root/trackdirect/config/trackdirect.ini + command: /root/trackdirect/server/scripts/collector.sh trackdirect.ini 0 + depends_on: + - "db" + - "aprsc" + + websocket: + image: peterus/trackdirect-python2:latest + restart: always + volumes: + - $PWD/config/trackdirect.ini:/root/trackdirect/config/trackdirect.ini + command: /root/trackdirect/server/scripts/wsserver.sh trackdirect.ini + ports: + - "9000:9000" + depends_on: + - "db" + - "aprsc" + + heatmaps: + image: peterus/trackdirect-python2:latest + restart: always + volumes: + - $PWD/config/trackdirect.ini:/root/trackdirect/config/trackdirect.ini + - $PWD/heatmaps:/root/trackdirect/htdocs/public/heatmaps + command: /root/trackdirect/server/scripts/heatmapcreator.sh trackdirect.ini /root/trackdirect/htdocs/public/heatmaps + depends_on: + - "db" + + web: + image: peterus/trackdirect-apache:latest + restart: always + volumes: + - $PWD/config/trackdirect.ini:/root/trackdirect/config/trackdirect.ini + - $PWD/heatmaps:/root/trackdirect/htdocs/public/heatmaps + ports: + - "80:80" + depends_on: + - "db" + + db: + image: peterus/trackdirect-db:latest + restart: always + environment: + POSTGRES_USER: root + POSTGRES_PASSWORD: foobar + POSTGRES_DB: trackdirect + volumes: + - $PWD/db:/var/lib/postgresql/data From 83a005d60df2c3269f4b67d20b37b8dffec9f5b5 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Fri, 4 Feb 2022 21:29:55 +0100 Subject: [PATCH 19/24] add docker info to readme further up --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8ad1365..1312966 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ Information shared over the APRS network is for example coordinates, altitude, s ## Getting Started These instructions will get you a copy of the project up and running on your local machine for development and testing purposes (but they are of course also valid for you who want to set up a public website). +Further down you will find some information how to install trackdirect with Docker and Docker-Compose. ### Prerequisites From 06c374daf6aaa941866d22435664b2e0cb448ba8 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Fri, 4 Feb 2022 21:30:38 +0100 Subject: [PATCH 20/24] readme update --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1312966..6f81107 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ Information shared over the APRS network is for example coordinates, altitude, s ## Getting Started These instructions will get you a copy of the project up and running on your local machine for development and testing purposes (but they are of course also valid for you who want to set up a public website). + Further down you will find some information how to install trackdirect with Docker and Docker-Compose. ### Prerequisites From a6f28364193db4783c7e64e7ff0154b39577ba9f Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Fri, 4 Feb 2022 21:36:28 +0100 Subject: [PATCH 21/24] update config --- config/trackdirect.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/trackdirect.ini b/config/trackdirect.ini index d5898b8..3b9f2c9 100644 --- a/config/trackdirect.ini +++ b/config/trackdirect.ini @@ -44,7 +44,7 @@ frequency_limit="0" ;; First APRS IS server for the websocket server to connect to. ;; Important: Please set up your own APRS IS server, do not use a public server. -aprs_host1="127.0.0.1" +aprs_host1="aprsc" aprs_port1="14580" ;; Important that you set the correct source, otherwise it might be handled incorrect From dfaecbe4ca9821ddfea38fdde423539c919b3d3d Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sat, 5 Feb 2022 19:29:01 +0100 Subject: [PATCH 22/24] add MagicBadness again --- config/aprsc.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/config/aprsc.conf b/config/aprsc.conf index dec056d..48d5927 100755 --- a/config/aprsc.conf +++ b/config/aprsc.conf @@ -27,3 +27,4 @@ HTTPStatusOptions ShowEmail=1 # After configuring the rest of the settings, remove this bad command # from the configuration file. It's here only to avoid starting the # server up accidentally with an invalid configuration. +MagicBadness 42.7 From 1143da1dfa50c41b82f8eb2c1d90830bf0ab6b51 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sat, 5 Feb 2022 19:31:56 +0100 Subject: [PATCH 23/24] revert changes and add comments --- config/trackdirect.ini | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/config/trackdirect.ini b/config/trackdirect.ini index d9098b1..ac40126 100644 --- a/config/trackdirect.ini +++ b/config/trackdirect.ini @@ -11,9 +11,11 @@ owner_email="no@name.com" [database] ;; Basic database settings -host="db" +;; If using docker, set host to "db" +host="127.0.0.1" database="trackdirect" -username="root" +;; If using docker, activate username and set to "root" +;username="username" password="foobar" port="5432" @@ -50,7 +52,8 @@ frequency_limit="0" ;; First APRS IS server for the websocket server to connect to. ;; Important: Please set up your own APRS IS server, do not use a public server. -aprs_host1="aprsc" +;; If using docker, set aprs_host1 to "aprsc" +aprs_host1="127.0.0.1" aprs_port1="14580" ;; Important that you set the correct source, otherwise it might be handled incorrect @@ -88,7 +91,8 @@ max_queued_realtime_packets="30" [collector0] -host="aprsc" +;; If using docker, set host to "aprsc" +host="127.0.0.1" port_full="10152" port_filtered="14580" From fae973aee2932651c94b53c352e154a50ff98885 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sat, 5 Feb 2022 19:34:29 +0100 Subject: [PATCH 24/24] update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6f81107..9a3083c 100644 --- a/README.md +++ b/README.md @@ -262,7 +262,7 @@ There is everything prepared to run trackdirect inside of some docker containers Install [docker](https://docs.docker.com/get-docker/) and [docker-compose](https://docs.docker.com/compose/install/) from the published websites. ### Config file -Adopt your config in `config/aprsc.conf` and `config/trackdirect.ini`. +Adopt your config in `config/aprsc.conf` and `config/trackdirect.ini`. In `trackdirect.ini` search for 'docker' and change the lines as described in the comments. ### Run Docker-Compose for development containers