Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update config.json.template #66

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update config.json.template #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
807692e
Update config.json.template
DocViper666 May 19, 2024
78b2d12
Update webapp.py
DocViper666 May 19, 2024
5016db9
Update webapp.py
DocViper666 May 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions cfg/config.json.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
"mail":"[email protected]",
"enable_cq_filter":"n",
"telnet": {
"host": "mysite",
"port": "7300",
"user": "myuser",
"password": ""
"telnet_host": "mysite",
"telnet_port": "7300",
"telnet_user": "myuser",
"telnet_password": ""
},
"menu": {
"menu_list": [
{"label":"Charts & stats", "link": "/plots.html", "external": false},
{"label": "Propagation", "link": "/propagation.html", "external": false},
{"label":"Propagation", "link": "/propagation.html", "external": false},
{"label":"Sources", "link": "https://github.com/coulisse/spiderweb/" , "external": true},
{"label":"Cookies", "link": "/cookies.html", "external": false},
{"label":"Privacy", "link": "/privacy.html", "external": false}
Expand Down
20 changes: 10 additions & 10 deletions webapp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,10 @@ def spotlist():


def who_is_connected():
host=cfg["telnet"]["host"]
port=cfg["telnet"]["port"]
user=cfg["telnet"]["user"]
password=cfg["telnet"]["password"]
host=cfg["telnet"]["telnet_host"]
port=cfg["telnet"]["telnet_port"]
user=cfg["telnet"]["telnet_user"]
password=cfg["telnet"]["telnet_password"]
response = who(host, port, user, password)
logger.debug("list of connected clusters:")
logger.debug(response)
Expand Down Expand Up @@ -208,7 +208,7 @@ def spots():
"index.html",
inline_script_nonce=get_nonce(),
mycallsign=cfg["mycallsign"],
telnet=cfg["telnet"]["host"]+":"+cfg["telnet"]["port"],
telnet=cfg["telnet"]["telnet_host"]+":"+cfg["telnet"]["telnet_port"],
mail=cfg["mail"],
menu_list=cfg["menu"]["menu_list"],
visits=len(visits),
Expand Down Expand Up @@ -266,7 +266,7 @@ def plots():
"plots.html",
inline_script_nonce=get_nonce(),
mycallsign=cfg["mycallsign"],
telnet=cfg["telnet"]["host"]+":"+cfg["telnet"]["port"],
telnet=cfg["telnet"]["telnet_host"]+":"+cfg["telnet"]["telnet_port"],
mail=cfg["mail"],
menu_list=cfg["menu"]["menu_list"],
visits=len(visits),
Expand Down Expand Up @@ -298,7 +298,7 @@ def propagation():
"propagation.html",
inline_script_nonce=get_nonce(),
mycallsign=cfg["mycallsign"],
telnet=cfg["telnet"]["host"]+":"+cfg["telnet"]["port"],
telnet=cfg["telnet"]["telnet_host"]+":"+cfg["telnet"]["telnet_port"],
mail=cfg["mail"],
menu_list=cfg["menu"]["menu_list"],
visits=len(visits),
Expand All @@ -316,7 +316,7 @@ def cookies():
"cookies.html",
inline_script_nonce=get_nonce(),
mycallsign=cfg["mycallsign"],
telnet=cfg["telnet"]["host"]+":"+cfg["telnet"]["port"],
telnet=cfg["telnet"]["telnet_host"]+":"+cfg["telnet"]["telnet_port"],
mail=cfg["mail"],
menu_list=cfg["menu"]["menu_list"],
visits=len(visits),
Expand All @@ -331,7 +331,7 @@ def privacy():
"privacy.html",
inline_script_nonce=get_nonce(),
mycallsign=cfg["mycallsign"],
telnet=cfg["telnet"]["host"]+":"+cfg["telnet"]["port"],
telnet=cfg["telnet"]["telnet_host"]+":"+cfg["telnet"]["telnet_port"],
mail=cfg["mail"],
menu_list=cfg["menu"]["menu_list"],
visits=len(visits),
Expand All @@ -353,7 +353,7 @@ def callsign():
"callsign.html",
inline_script_nonce=get_nonce(),
mycallsign=cfg["mycallsign"],
telnet=cfg["telnet"]["host"]+":"+cfg["telnet"]["port"],
telnet=cfg["telnet"]["telnet_host"]+":"+cfg["telnet"]["telnet_port"],
mail=cfg["mail"],
menu_list=cfg["menu"]["menu_list"],
visits=len(visits),
Expand Down