forked from idaholab/Malcolm
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Moved list of Malcolm URLs to when Malcolm is actually finished starting
- Loading branch information
Showing
1 changed file
with
18 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -617,6 +617,23 @@ def logs(): | |
|
||
else: | ||
time.sleep(0.5) | ||
|
||
if finishedStarting: | ||
process.terminate() | ||
# # TODO: Replace 'localhost' with an outwards-facing IP since I doubt anybody is | ||
# accessing these from the Malcolm server. | ||
print("Started Malcolm\n\n") | ||
print("Malcolm services can be accessed via the following URLs:") | ||
print("------------------------------------------------------------------------------") | ||
print(" - Arkime: https://localhost/") | ||
print(" - OpenSearch Dashboards: https://localhost/dashboards/") | ||
print(" - PCAP upload (web): https://localhost/upload/") | ||
print(" - PCAP upload (sftp): sftp://[email protected]:8022/files/") | ||
print(" - Host and subnet name mapping editor: https://localhost/name-map-ui/") | ||
print(" - NetBox: https://localhost/netbox/\n") | ||
print(" - Account management: https://localhost:488/\n") | ||
print(" - Documentation: https://localhost/readme/\n") | ||
|
||
process.poll() | ||
|
||
|
||
|
@@ -820,19 +837,7 @@ def start(): | |
|
||
# start docker | ||
err, out = run_process([dockerComposeBin, '-f', args.composeFile, 'up', '--detach'], env=osEnv, debug=args.debug) | ||
if err == 0: | ||
eprint("Started Malcolm\n\n") | ||
eprint("In a few minutes, Malcolm services will be accessible via the following URLs:") | ||
eprint("------------------------------------------------------------------------------") | ||
eprint(" - Arkime: https://localhost/") | ||
eprint(" - OpenSearch Dashboards: https://localhost/dashboards/") | ||
eprint(" - PCAP upload (web): https://localhost/upload/") | ||
eprint(" - PCAP upload (sftp): sftp://[email protected]:8022/files/") | ||
eprint(" - Host and subnet name mapping editor: https://localhost/name-map-ui/") | ||
eprint(" - NetBox: https://localhost/netbox/\n") | ||
eprint(" - Account management: https://localhost:488/\n") | ||
eprint(" - Documentation: https://localhost/readme/\n") | ||
else: | ||
if err != 0: | ||
eprint("Malcolm failed to start\n") | ||
eprint("\n".join(out)) | ||
exit(err) | ||
|