diff --git a/docker-configs/docker-compose.yml b/docker-configs/docker-compose.yml
index 8b412d3..4ae5d52 100644
--- a/docker-configs/docker-compose.yml
+++ b/docker-configs/docker-compose.yml
@@ -45,11 +45,10 @@ services:
adn-dashboard:
container_name: adn-dashboard
mem_reservation: 512m
- # Before enabling local mapping, download the file to the host machine:
- # DASHBOARD Style: 1 for OA4DOA , dash 2 for CS8ABG
- # file config dash 1 : docker cp monitor:/opt/FDMR-Monitor1/fdmr-mon.cfg .
- # file config dash 2 : docker cp monitor:/opt/FDMR-Monitor2/fdmr-mon.cfg .
-# volumes:
+ volumes:
+ - './sql:/opt/adn-dashboard/html/db'
+ - './mysql:/var/lib/mysql'
+ - './ssl:/opt/ssl'
# Dash1
# - './logo.png:/opt/FDMR-Monitor1/html/img/logo.png'
# - './favicon.ico:/opt/FDMR-Monitor1/html/img/favicon.ico'
@@ -61,9 +60,13 @@ services:
# - './logo.png:/opt/adn-dashboard/html/img/banner_SAMPLE.png'
# - './bk.jpg:/opt/adn-dashboard/html/img/background_SAMPLE.jpg'
# - './favicon.ico:/opt/adn-dashboard/html/img/favicon_SAMPLE.ico'
+ # Dash4
+# - './logo.png:/opt/adn-monitor/frontend/dist/img/logo.png:ro'
+# - './bk.jpg:/opt/adn-monitor/frontend/dist/img/bk.jpg:ro'
+# - './favicon.ico:/opt/adn-monitor/frontend/dist/favicon.ico:ro'
ports:
- '80:80/tcp'
- - '443:443/tcp'
+# - '443:443/tcp'
- '9000:9000'
depends_on:
- 'adn-server'
@@ -71,7 +74,7 @@ services:
# For info TZ list: https://gist.github.com/alejzeis/ad5827eb14b5c22109ba652a1a267af5#file-timezone-mappings-csv
- TZ=America/Panama
# Select DASHBOARD Style: 1 to OA4DOA, 2 to CS8ABG, 3 to CS8ABG with Map
- - DASHBOARD=3
+ - DASHBOARD=4
# Selfcare Button
- SELFCARE=False
# To enable SSL, enter the dashboard's DNS and your email account.
@@ -89,9 +92,12 @@ services:
# Navbar Links Name, SAMPLE: NAV_LNK_NAME=LINKS
# LINKx put as many as you want, SAMPLE: LINK1=NameX,http://url.com
- NAV_LNK_NAME=
- - LINK1=NameX,http://url.link
- - LINK2=NameX,https://site.link
- - LINK3=NameX,https://goaway.link
+ - LINK1=
+ - LINK2=
+ - LINK3=
+ # NEWSx put as many as you want, SAMPLE: NEWS1=NameX,http://url.com OR: NEWS1=ADN Systems
+# - NEWS1=NameX,http://url.link
+# - NEWS2=Text
# World Wide Server List, SAMPLE: http://url/Hosts.csv
- SERVER_LIST=
# World Wide Bridge List, SAMPLE: https://url/Bridges.csv
diff --git a/docker-configs/docker-compose2.yml b/docker-configs/docker-compose2.yml
index 6b1e61f..a4b3c3d 100644
--- a/docker-configs/docker-compose2.yml
+++ b/docker-configs/docker-compose2.yml
@@ -45,12 +45,9 @@ services:
container_name: monitor
mem_reservation: 512m
restart: "always"
- # Before enabling local mapping, download the file to the host machine:
- # DASHBOARD Style: 1 for OA4DOA , dash 2 for CS8ABG
- # file config dash 1 : docker cp monitor:/opt/FDMR-Monitor1/fdmr-mon.cfg .
- # file config dash 2 : docker cp monitor:/opt/FDMR-Monitor2/fdmr-mon.cfg .
- volumes:
- './sql:/opt/adn-dashboard/html/db'
+ - './mysql:/var/lib/mysql'
+ - './ssl:/opt/ssl'
# Dash1
# - './logo.png:/opt/FDMR-Monitor1/html/img/logo.png'
# - './favicon.ico:/opt/FDMR-Monitor1/html/img/favicon.ico'
@@ -62,11 +59,14 @@ services:
# - './logo.png:/opt/adn-dashboard/html/img/banner_SAMPLE.png'
# - './bk.jpg:/opt/adn-dashboard/html/img/background_SAMPLE.jpg'
# - './favicon.ico:/opt/adn-dashboard/html/img/favicon_SAMPLE.ico'
+ # Dash4
+# - './logo.png:/opt/adn-monitor/frontend/dist/img/logo.png:ro'
+# - './bk.jpg:/opt/adn-monitor/frontend/dist/img/bk.jpg:ro'
+# - './favicon.ico:/opt/adn-monitor/frontend/dist/favicon.ico:ro'
ports:
- '80:80/tcp'
- # - '443:443/tcp'
+# - '443:443/tcp'
- '9000:9000'
- - '62031:62031/udp'
depends_on:
- 'adn-server'
environment:
@@ -93,9 +93,12 @@ services:
# Navbar Links Name, SAMPLE: NAV_LNK_NAME=LINKS
# LINKx put as many as you want, SAMPLE: LINK1=NameX,http://url.com
- NAV_LNK_NAME=
- - LINK1=NameX,http://url.link
- - LINK2=NameX,https://site.link
- - LINK3=NameX,https://goaway.link
+ - LINK1=
+ - LINK2=
+ - LINK3=
+ # NEWSx put as many as you want, SAMPLE: NEWS1=NameX,http://url.com OR: NEWS1=ADN Systems
+# - NEWS1=NameX,http://url.link
+# - NEWS2=Text
# World Wide Server List, SAMPLE: http://url/Hosts.csv
- SERVER_LIST=
# World Wide Bridge List, SAMPLE: https://url/Bridges.csv
diff --git a/docker-configs/docker-compose_install.sh b/docker-configs/docker-compose_install.sh
index 562f9df..923ecc3 100644
--- a/docker-configs/docker-compose_install.sh
+++ b/docker-configs/docker-compose_install.sh
@@ -34,7 +34,6 @@ chmod -R 755 /etc/ADN-Systems &&
echo make json directory...
mkdir -p /etc/ADN-Systems/data &&
-chown 54000:54000 /etc/ADN-Systems/data &&
echo Install /etc/ADN-Systems/adn.cfg ...
cat << EOF > /etc/ADN-Systems/adn.cfg
@@ -199,106 +198,6 @@ OVERRIDE_IDENT_TG:
EOF
#
-echo Install /etc/ADN-Systems/fdmr-mon.cfg ...
-cat << EOF > /etc/ADN-Systems/fdmr-mon.cfg
-[GLOBAL]
-# Display Bridge status
-BRIDGES_INC = False
-# Display Peers status
-HOMEBREW_INC = True
-# Lastheard table on main page
-LASTHEARD_ROWS = 20
-# Display empty masters
-EMPTY_MASTERS = False
-# TG Count on TOP TG's page
-TGCOUNT_ROWS = 20
-
-[FDMR CONNECTION]
-# FDMR server's IP Address or hostname
-FDMR_IP = adn-server
-# FDMR server's TCP reporting socket
-FDMR_PORT = 4321
-
-[OPB FILTER]
-# if you don't want to show in lastherad received traffic from OBP link put NETWORK ID
-# for example: 260210, 260211, 260212
-OPB_FILTER =
-
-[FILES]
-# Files and stuff for loading alias files for mapping numbers to names
-FILES_PATH = ./data
-# This files will auto-download
-PEER_FILE = peer_ids.json
-SUBSCRIBER_FILE = subscriber_ids.json
-TGID_FILE = talkgroup_ids.json
-# User provided files, if you don't use it, you can comment it.
-LOCAL_SUB_FILE = local_subscriber_ids.json
-LOCAL_PEER_FILE = local_peer_ids.json
-LOCAL_TGID_FILE = local_talkgroup_ids.json
-# Number of days before we reload DMR-MARC database files.
-RELOAD_TIME = 1
-PEER_URL = https://servers.adn.systems/peer_ids.json
-SUBSCRIBER_URL = https://servers.adn.systems/subscriber_ids.json
-TGID_URL = https://servers.adn.systems/talkgroup_ids.json
-
-
-
-[LOGGER]
-# Settings for log files
-LOG_PATH = /dev/
-LOG_FILE = null
-LOG_LEVEL = WARN
-
-[WEBSOCKET SERVER]
-WEBSOCKET_PORT = 9000
-# Frequency to push updates to web clients
-FREQUENCY = 1
-# Clients are timed out after this many seconds, 0 to disable
-CLIENT_TIMEOUT = 0
-# SSL configuration
-USE_SSL = False
-SSL_PATH = ./ssl
-SSL_CERTIFICATE = cert.pem
-SSL_PRIVATEKEY = key.pem
-
-[DASHBOARD]
- # Dashboard Title
-DASHTITLE = "DMR Server"
- # Background image True or False if True put a bk.jpg 1920x1080 in img folder
-BACKGROUND = False
- # this defines the default language
- # available languages: en, es, fr, pt, it, nl, de
-LANGUAGE = "en"
- # Navbar Title
-NAVTITLE= "DMR Server"
- # --Navbar Links-- #
-#NAV_LNK_NAME = "Links"
-#LINK1 = "Name 1", "http://url.link"
-#LINK2 = "Name 2", "https://site.link"
-#LINK3 = "Name 3", "https://goaway.link"
- #LINKx put as many as you want
- # World Wide Server List
-#SERVER_LIST = "http://url/Hosts.txt"
- # World Wide Bridge List
-#BRIDGES_LIST = "https://url/Bridges.csv"
- # World Wide TalkGroups List
-#TG_LIST = "https://url/Talkgroups.csv"
-#TELEGRAM = "url"
-#WHATSAPP = "url"
-#FACEBOOK = "url"
-#SERVER_LIST = "http://yourwebsite/Hosts.txt"
- # --Footer Links-- #
- # Beginning of footer
-#FOOTER1 = "SYSOP N0CALL"
- # End of footer
-#FOOTER2 = "Your Project Project"
-
-EOF
-
-
-echo Set perms on config directory...
-chown -R 54000 /etc/ADN-Systems &&
-
echo Get docker-compose.yml...
cd /etc/ADN-Systems &&
curl https://raw.githubusercontent.com/Amateur-Digital-Network/ADN-DMR-Peer-Server/develop/docker-configs/docker-compose.yml -o docker-compose.yml &&
@@ -308,21 +207,6 @@ if grep -q "Raspberry Pi" /proc/device-tree/model 2>/dev/null; then
sed -i "s/^mem_reservation/#mem_reservation/g" /etc/ADN-Systems/docker-compose.yml
fi
-chmod 755 /etc/cron.daily/lastheard
-
-echo Tune network stack...
-cat << EOF > /etc/sysctl.conf &&
-net.core.rmem_default=134217728
-net.core.rmem_max=134217728
-net.core.wmem_max=134217728
-net.core.rmem_default=134217728
-net.core.netdev_max_backlog=250000
-net.netfilter.nf_conntrack_udp_timeout=15
-net.netfilter.nf_conntrack_udp_timeout_stream=35
-EOF
-
-/usr/sbin/sysctl -p &&
-
echo Run ADN-Systems container...
docker-compose up -d
diff --git a/docker-configs/docker-compose_install2.sh b/docker-configs/docker-compose_install2.sh
index 9402fea..b9790f2 100644
--- a/docker-configs/docker-compose_install2.sh
+++ b/docker-configs/docker-compose_install2.sh
@@ -35,7 +35,6 @@ chmod -R 755 /etc/ADN-Systems &&
echo make json directory...
mkdir -p /etc/ADN-Systems/data &&
-chown 54000:54000 /etc/ADN-Systems/data &&
echo Install /etc/ADN-Systems/adn.cfg ...
cat << EOF > /etc/ADN-Systems/adn.cfg
@@ -200,113 +199,7 @@ OVERRIDE_IDENT_TG:
EOF
#
-echo Install /etc/ADN-Systems/fdmr-mon.cfg ...
-cat << EOF > /etc/ADN-Systems/fdmr-mon.cfg
-[GLOBAL]
-# Display Bridge status
-BRIDGES_INC = False
-# Display Homebrew Peers status
-HOMEBREW_INC = True
-# Display lastheard table on main page
-LASTHEARD_INC = True
-LASTHEARD_ROWS = 20
-# Display empty masters in status
-EMPTY_MASTERS = False
-# Display TG Count on tgcount page
-TGCOUNT_INC = True
-TGCOUNT_ROWS = 20
-
-[SELF SERVICE]
-# Database credentials, assuming you are running MySQL.
-DB_SERVER = mariadb
-DB_USERNAME = hbmon
-DB_PASSWORD = hbmon
-DB_NAME = hbmon
-DB_PORT = 3306
-
-[FDMR CONNECTION]
-# FDMR server's IP Address
-FDMR_IP = adn-server
-# FDMR server's TCP reporting socket
-FDMR_PORT = 4321
-
-[OPB FILTER]
-# Generally you don't need to use this but
-# if you don't want to show in lastherad received traffic from OBP link put NETWORK ID
-# for example: 260210, 260211, 260212
-OPB_FILTER =
-
-[FILES]
-# Files and stuff for loading alias files for mapping numbers to names
-FILES_PATH = ./data
-# This files will auto-download
-PEER_FILE = peer_ids.json
-SUBSCRIBER_FILE = subscriber_ids.json
-TGID_FILE = talkgroup_ids.json
-# User provided files, if you don't use it, you can comment it.
-LOCAL_SUB_FILE = local_subscriber_ids.json
-LOCAL_PEER_FILE = local_peer_ids.json
-LOCAL_TGID_FILE = local_talkgroup_ids.json
-# Number of days before we reload DMR-MARC database files.
-RELOAD_TIME = 1
-PEER_URL = https://servers.adn.systems/peer_ids.json
-SUBSCRIBER_URL = https://servers.adn.systems/subscriber_ids.json
-TGID_URL = https://servers.adn.systems/talkgroup_ids.json
-
-[LOGGER]
-# Settings for log files
-LOG_PATH = /dev/
-LOG_FILE = null
-LOG_LEVEL = WARN
-
-[WEBSOCKET SERVER]
-WEBSOCKET_PORT = 9000
-# Frequency to push updates to web clients
-FREQUENCY = 1
-# Clients are timed out after this many seconds, 0 to disable
-CLIENT_TIMEOUT = 0
-# SSL configuration
-USE_SSL = False
-SSL_PATH = ./ssl
-SSL_CERTIFICATE = cert.pem
-SSL_PRIVATEKEY = key.pem
-
-[DASHBOARD]
- # Dashboard Title
-DASHTITLE = "DMR Server"
- # Background image True or False if True put a bk.jpg 1920x1080 in img folder
-BACKGROUND = False
- # this defines the default language
- # available languages: en, es, fr, pt, it, nl, de
-LANGUAGE = "es"
- # Navbar Title
-NAVTITLE= "DMR Server"
- # --Navbar Links-- #
-#NAV_LNK_NAME = "Links"
-#LINK1 = "Name 1", "http://url.link"
-#LINK2 = "Name 2", "https://site.link"
-#LINK3 = "Name 3", "https://goaway.link"
- #LINKx put as many as you want
- # World Wide Server List
-#SERVER_LIST = "https://adn.systems/servers/adn-servers.csv"
- # World Wide Bridge List
-#BRIDGES_LIST = "https://url/Bridges.csv"
- # World Wide TalkGroups List
-#TG_LIST = "https://url/Talkgroups.csv"
-####TELEGRAM = "url"
-#WHATSAPP = "url"
-#FACEBOOK = "url"
- # --Footer Links-- #
- # Beginning of footer
-#FOOTER1 = "SYSOP N0CALL"
- # End of footer
-#FOOTER2 = "Your Project Project"
-
-EOF
-
-
echo Set perms on config directory...
-chown -R 54000 /etc/ADN-Systems &&
echo Get docker-compose.yml...
cd /etc/ADN-Systems &&
@@ -317,21 +210,6 @@ if grep -q "Raspberry Pi" /proc/device-tree/model 2>/dev/null; then
sed -i "s/^mem_reservation/#mem_reservation/g" /etc/ADN-Systems/docker-compose.yml
fi
-chmod 755 /etc/cron.daily/lastheard
-
-echo Tune network stack...
-cat << EOF > /etc/sysctl.conf &&
-net.core.rmem_default=134217728
-net.core.rmem_max=134217728
-net.core.wmem_max=134217728
-net.core.rmem_default=134217728
-net.core.netdev_max_backlog=250000
-net.netfilter.nf_conntrack_udp_timeout=15
-net.netfilter.nf_conntrack_udp_timeout_stream=35
-EOF
-
-/usr/sbin/sysctl -p &&
-
echo Run ADN-Systems container...
docker-compose up -d