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 0000000..6591317 Binary files /dev/null and b/web/docker/hbnet.sqlite differ