From 8c48c11547e37094ca06e274d0bf50108fb0e893 Mon Sep 17 00:00:00 2001 From: KF7EEL Date: Sat, 24 Sep 2022 20:06:14 -0700 Subject: [PATCH] 2nd attempt --- web/Dockerfile | 4 ++-- web/docker/config.py | 23 ++++++++++++----------- web/docker/hbnet.sqlite | Bin 0 -> 151552 bytes 3 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 web/docker/hbnet.sqlite diff --git a/web/Dockerfile b/web/Dockerfile index 153a32c..9c65d28 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -25,8 +25,8 @@ RUN chown -R www-data:www-data /var/log/nginx COPY docker/wsgi.py /opt/hbnet_web COPY docker/wsgi.ini /opt/hbnet_web -COPY ../docker/web_service/config.py /opt/hbnet_web -COPY ../docker/web_service/hbnet.sqlite /opt/hbnet_web +COPY docker/config.py /opt/hbnet_web +COPY docker/hbnet.sqlite /opt/hbnet_web RUN mkdir -p /opt/hbnet_web/data diff --git a/web/docker/config.py b/web/docker/config.py index 5203943..5d486ea 100644 --- a/web/docker/config.py +++ b/web/docker/config.py @@ -1,3 +1,4 @@ + ''' Settings for HBNet Web Server. ''' @@ -13,15 +14,15 @@ db_location = 'sqlite:////opt/hbnet_web/data/hbnet.sqlite' # Title of the HBNet Web Service/DMR network -title = 'HBNet Web Service (Docker)' -# Port to run server, not needed if using Docker or uWSGI with NGINX or Apache2 +title = 'HBNet Web Service' +# Port to run server hws_port = 8080 # IP to run server on hws_host = '127.0.0.1' # Publicly accessible URL of the web server. THIS IS REQUIRED AND MUST BE CORRECT. url = 'http://localhost:8080' # Replace below with some random string such as an SHA256 -secret_key = '123456789123456789123456789123456789123456789' +secret_key = '431bf7b75e3465eba7a8fe1638ea14fd2ca5f61021513b8b2cd076a8ec3f43c8' # Mode is used to disable certain features of the web service. # This is primarily used to to turn the web service into a generic APRS/SMS dashboard. @@ -45,9 +46,9 @@ default_account_state = True legacy_passphrase = 'passw0rd' # Coordinates to center map over -center_map = [45.372, -121.6972] +center_map = [00.000, -000.0000] # Default map zoom level -map_zoom = 5 +map_zoom = 10 # Passphrase calculation config. If REMOTE_CONFIG is not used in your DMR server config # (hblink.cfg), then the values in section [USER_MANAGER] MUST match the values below. @@ -55,20 +56,20 @@ map_zoom = 5 # These config options affect the generation of user passphrases. # Set to a value between 1 - 99. This value is used in the normal calculation. -append_int = 1 +append_int = 12 # Set to a value between 1 - 99. This value is used for compromised passphrases. -burn_int = 5 +burn_int = 59 # Set to a value between 1 - 99 This value is used in the normal calculation. -extra_int_1 = 5 +extra_int_1 = 43 # Set to a value between 1 - 99 This value is used in the normal calculation. -extra_int_2 = 8 +extra_int_2 = 82 # Set to a length of about 10 characters. -extra_1 = 'TeSt' -extra_2 = 'DmR4' +extra_1 = 'HbNT' +extra_2 = 'WrkS' # Shorten generated passphrases use_short_passphrase = True diff --git a/web/docker/hbnet.sqlite b/web/docker/hbnet.sqlite new file mode 100644 index 0000000000000000000000000000000000000000..659131766b7d267cdda07d0f0ab1ff95ce7fbe3b GIT binary patch literal 151552 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 literal 0 HcmV?d00001