forked from 3wordchant/capsul-flask
		
	Make the displayed SSH username configurable
This patch allows the SSH username displayed in templates to be configured through the SSH_USERNAME environment variable.
This commit is contained in:
		| @ -58,6 +58,7 @@ app.config.from_mapping( | ||||
|   LOG_LEVEL=os.environ.get("LOG_LEVEL", default="INFO"), | ||||
|   SPOKE_HOST_ID=os.environ.get("SPOKE_HOST_ID", default="baikal"), | ||||
|   SPOKE_HOST_TOKEN=os.environ.get("SPOKE_HOST_TOKEN", default="changeme"), | ||||
|   SSH_USERNAME=os.environ.get("SSH_USERNAME", default="cyberian"), | ||||
|   HUB_TOKEN=os.environ.get("HUB_TOKEN", default="changeme"), | ||||
|  | ||||
|   # https://www.postgresql.org/docs/9.1/libpq-ssl.html#LIBPQ-SSL-SSLMODE-STATEMENTS | ||||
|  | ||||
| @ -108,6 +108,8 @@ def detail(id): | ||||
|   if vm is None: | ||||
|     return abort(404, f"{id} doesn't exist.") | ||||
|  | ||||
|   vm['ssh_username'] = current_app.config['SSH_USERNAME'] | ||||
|  | ||||
|   if vm['deleted']: | ||||
|     return render_template("capsul-detail.html", vm=vm, delete=True, deleted=True) | ||||
|  | ||||
|  | ||||
| @ -22,7 +22,7 @@ def pricing(): | ||||
|  | ||||
| @bp.route("/faq") | ||||
| def faq(): | ||||
|   return render_template("faq.html") | ||||
|   return render_template("faq.html", ssh_username=current_app.config['SSH_USERNAME']) | ||||
|  | ||||
| @bp.route("/about-ssh") | ||||
| def about_ssh(): | ||||
|  | ||||
| @ -97,7 +97,7 @@ | ||||
|       </div> | ||||
|       <div class="row justify-start"> | ||||
|         <label class="align" for="ssh_username">SSH Username</label> | ||||
|         <span id="ssh_username">cyberian</span> | ||||
|         <span id="ssh_username">{{ vm['ssh_username'] }}</span> | ||||
|       </div> | ||||
|       <div class="row justify-start"> | ||||
|         <label class="align" for="ssh_authorized_keys">SSH Authorized Keys</label> | ||||
|  | ||||
| @ -21,13 +21,13 @@ | ||||
|    </li> | ||||
|    <li> | ||||
|      How do I log in? | ||||
|      <p>ssh to the ip provided to you using the cyberian user.</p> | ||||
|      <pre class='code'>$ ssh cyberian@1.2.3.4</pre> | ||||
|      <p>ssh to the ip provided to you using the "{{ ssh_username }}" user.</p> | ||||
|      <pre class='code'>$ ssh {{ ssh_username }}@1.2.3.4</pre> | ||||
|      <p>For more information, see <a href="/about-ssh">Understanding the Secure Shell Protocol (SSH)</a>.</p> | ||||
|    </li> | ||||
|    <li> | ||||
|      How do I change to the root user? | ||||
|      <p>The cyberian user has passwordless sudo access by default. This should work:</p> | ||||
|      <p>The "{{ ssh_username }}" user has passwordless sudo access by default. This should work:</p> | ||||
|      <pre class='code'> | ||||
| # Linux | ||||
| $ sudo su - | ||||
|  | ||||
		Reference in New Issue
	
	Block a user