This commit is contained in:
matthewalanpenning 2023-10-31 06:34:14 -04:00
parent c74597cb0c
commit a06e67f489
9 changed files with 34 additions and 32 deletions

View file

@ -1,6 +1,6 @@
# 0.4.0 # 0.4.0
- Upgraded Bootstrap from version 4 to version 5 - Upgraded Bootstrap from version 4 to version 5
- Converted containers and virtual-machines endpoints to instances endpoint - Converted containers and virtual-machines endpoints to instances endpoint to support Incus
- Combined containers and virtual-machines pages to instances page - Combined containers and virtual-machines pages to instances page
- Datatable errors now display on console.log rather than the default alert - Datatable errors now display on console.log rather than the default alert
- Handled 404 error for logs on a new virtual machine - Handled 404 error for logs on a new virtual machine

View file

@ -117,10 +117,10 @@
<div class="form-group"> <div class="form-group">
<input type="text" class="form-control" placeholder="" name="server_name"> <input type="text" class="form-control" placeholder="" name="server_name">
</div> </div>
<span>After renaming a cluster member, restart the LXD service on the host to clear cached name information.</span> <span>After renaming a cluster member, restart the LXD/Incus service on the host to clear cached name information.</span>
</div> </div>
<div class="col-1"> <div class="col-1">
<i class="far fa-sm fa-question-circle" title='Enter in the new name of the cluster member. Host alias will apply rename changes after LXD services have restarted on host.'></i> <i class="far fa-sm fa-question-circle" title='Enter in the new name of the cluster member. Host alias will apply rename changes after LXD/Incus services have restarted on host.'></i>
</div> </div>
</div> </div>
</form> </form>

View file

@ -429,7 +429,7 @@
</div> </div>
</div> </div>
<div class="col-1"> <div class="col-1">
<i class="far fa-sm fa-question-circle" title='For LXD managed storage volumes, select the storage pool where the source storage volume is located.'></i> <i class="far fa-sm fa-question-circle" title='For LXD/Incus managed storage volumes, select the storage pool where the source storage volume is located.'></i>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
@ -853,7 +853,7 @@
</div> </div>
</div> </div>
<div class="col-1"> <div class="col-1">
<i class="far fa-sm fa-question-circle" title='Select "network" to link to an existing LXD managed network or "nictype" to define your network.'></i> <i class="far fa-sm fa-question-circle" title='Select "network" to link to an existing LXD/Incus managed network or "nictype" to define your network.'></i>
</div> </div>
</div> </div>
<div class="row" id="networkNicTypeRow" style="display: none;"> <div class="row" id="networkNicTypeRow" style="display: none;">
@ -916,7 +916,7 @@
</div> </div>
</div> </div>
<div class="col-1"> <div class="col-1">
<i class="far fa-sm fa-question-circle" title='(Required) - Select the LXD network to link this device to.'></i> <i class="far fa-sm fa-question-circle" title='(Required) - Select the LXD/Incus network to link this device to.'></i>
</div> </div>
</div> </div>
<div class="row" id="networkInterfaceNameRow"> <div class="row" id="networkInterfaceNameRow">
@ -1948,7 +1948,7 @@
</div> </div>
</div> </div>
<div class="col-1"> <div class="col-1">
<i class="far fa-sm fa-question-circle" title='Select whether to automatically start the instance with LXD starts. If not set, defaults to instance last state.'></i> <i class="far fa-sm fa-question-circle" title='Select whether to automatically start the instance with LXD/Incus starts. If not set, defaults to instance last state.'></i>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
@ -2433,7 +2433,7 @@
</div> </div>
</div> </div>
<div class="col-1"> <div class="col-1">
<i class="far fa-sm fa-question-circle" title="Select whether the lxd-agent is queried for state information and metrics. Default: true."></i> <i class="far fa-sm fa-question-circle" title="Select whether the lxd-agent/incus-agent is queried for state information and metrics. Default: true."></i>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
@ -2515,7 +2515,7 @@
</div> </div>
</div> </div>
<div class="col-1"> <div class="col-1">
<i class="far fa-sm fa-question-circle" title="Select whether to support running LXD inside the instance. Default: false."></i> <i class="far fa-sm fa-question-circle" title="Select whether to support running LXD/Incus inside the instance. Default: false."></i>
</div> </div>
</div> </div>
<div class="row"> <div class="row">

View file

@ -271,7 +271,7 @@
</div> </div>
</div> </div>
<div class="col-1"> <div class="col-1">
<i class="far fa-sm fa-question-circle" title='Select the LXD cluster member or @group to deploy this instance on. Default: none'></i> <i class="far fa-sm fa-question-circle" title='Select the LXD/Incus cluster member or @group to deploy this instance on. Default: none'></i>
</div> </div>
</div> </div>
@ -305,7 +305,7 @@
</div> </div>
</div> </div>
<div class="col-1"> <div class="col-1">
<i class="far fa-sm fa-question-circle" title='Select whether to automatically start the instance when LXD starts. If not set, defaults to instance last state.'></i> <i class="far fa-sm fa-question-circle" title='Select whether to automatically start the instance when LXD/Incus starts. If not set, defaults to instance last state.'></i>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
@ -788,7 +788,7 @@
</div> </div>
</div> </div>
<div class="col-1"> <div class="col-1">
<i class="far fa-sm fa-question-circle" title="Select whether the lxd-agent is queried for state information and metrics. Default: true."></i> <i class="far fa-sm fa-question-circle" title="Select whether the lxd-agent/incus-agent is queried for state information and metrics. Default: true."></i>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
@ -870,7 +870,7 @@
</div> </div>
</div> </div>
<div class="col-1"> <div class="col-1">
<i class="far fa-sm fa-question-circle" title="Select whether to support running LXD inside the instance. Default: false."></i> <i class="far fa-sm fa-question-circle" title="Select whether to support running LXD/Incus inside the instance. Default: false."></i>
</div> </div>
</div> </div>
<div class="row"> <div class="row">

View file

@ -11,7 +11,7 @@
<div class="modal-body"> <div class="modal-body">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<p>Lxconsole is an open source management console providing a web-based user interface capable of managing multiple LXD servers from a single location.</p> <p>Lxconsole is an open source management console providing a web-based user interface capable of managing multiple LXD/Incus servers from a single location.</p>
<p> <p>
<strong>Version</strong>: <span id="versionNumber">v0.4.0</span> <br /> <strong>Version</strong>: <span id="versionNumber">v0.4.0</span> <br />
<strong>License</strong>: AGPL-3.0 <br /> <strong>License</strong>: AGPL-3.0 <br />

View file

@ -212,7 +212,7 @@
</div> </div>
</div> </div>
<div class="col-1"> <div class="col-1">
<i class="far fa-sm fa-question-circle" title='Select a DNS registration mode. Use "none" for no DNS record. Use "managed" for static records generated by LXD. Use "dynamic" for records generated by the client. Default: managed'></i> <i class="far fa-sm fa-question-circle" title='Select a DNS registration mode. Use "none" for no DNS record. Use "managed" for static records generated by LXD/Incus. Use "dynamic" for records generated by the client. Default: managed'></i>
</div> </div>
</div> </div>
<div class="row" id="networkDnsSearchRow" style="display: none;"> <div class="row" id="networkDnsSearchRow" style="display: none;">

View file

@ -156,7 +156,7 @@
</div> </div>
</div> </div>
<div class="col-1"> <div class="col-1">
<i class="far fa-sm fa-question-circle" title='Select whether or not to automatically update images that LXD caches. Default: (not set).'></i> <i class="far fa-sm fa-question-circle" title='Select whether or not to automatically update images that LXD/Incus caches. Default: (not set).'></i>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
@ -310,7 +310,7 @@
</div> </div>
</div> </div>
<div class="col-1"> <div class="col-1">
<i class="far fa-sm fa-question-circle" title='Select whether to block access to security-sensitive LXD features. Default: false'></i> <i class="far fa-sm fa-question-circle" title='Select whether to block access to security-sensitive LXD/Incus features. Default: false'></i>
</div> </div>
</div> </div>
<div class="row" id="projectRestrictedBackupsRow" style="display: none;"> <div class="row" id="projectRestrictedBackupsRow" style="display: none;">

View file

@ -3,14 +3,14 @@
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Add LXD Server</h5> <h5 class="modal-title" id="exampleModalLabel">Add LXD/Incus Server</h5>
<button class="close" type="button" data-bs-dismiss="modal" aria-label="Close"> <button class="close" type="button" data-bs-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span> <span aria-hidden="true">×</span>
</button> </button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p class="ml-4 mb-4"> <p class="ml-4 mb-4">
Before adding an LXD server, it must first trust your client certificate. <br /> Before adding an LXD/Incus server, it must first trust your client certificate. <br />
Click <a href="#" onclick="loadInstructionsModal()">here</a> for instructions on trusting certificates. Click <a href="#" onclick="loadInstructionsModal()">here</a> for instructions on trusting certificates.
</p> </p>
@ -22,7 +22,7 @@
</div> </div>
</div> </div>
<div class="col-1"> <div class="col-1">
<i class="far fa-sm fa-question-circle" title='(Required) - Enter in the IP address or FQDN of the LXD server'></i> <i class="far fa-sm fa-question-circle" title='(Required) - Enter in the IP address or FQDN of the LXD/Incus server'></i>
</div> </div>
</div> </div>
@ -34,7 +34,7 @@
</div> </div>
</div> </div>
<div class="col-1"> <div class="col-1">
<i class="far fa-sm fa-question-circle" title='(Required) - Enter in the network port to connect to the LXD server. Default: 8443'></i> <i class="far fa-sm fa-question-circle" title='(Required) - Enter in the network port to connect to the LXD/Incus server. Default: 8443'></i>
</div> </div>
</div> </div>
@ -61,7 +61,7 @@
</div> </div>
</div> </div>
<div class="col-1"> <div class="col-1">
<i class="far fa-sm fa-question-circle" title='Select whether or not the SSL/TLS certificate of the LXC server must be verified. By default LXD servers use a self-signed certificate. Default value: False'></i> <i class="far fa-sm fa-question-circle" title='Select whether or not the SSL/TLS certificate of the LXC server must be verified. By default LXD/Incus servers use a self-signed certificate. Default value: False'></i>
</div> </div>
</div> </div>
@ -94,7 +94,7 @@
</div> </div>
</div> </div>
<div class="col-1"> <div class="col-1">
<i class="far fa-sm fa-question-circle" title='(Required) - This field defines the IP address or FQDN used to connect to the rest API of an LXD server'></i> <i class="far fa-sm fa-question-circle" title='(Required) - This field defines the IP address or FQDN used to connect to the rest API of an LXD/Incus server'></i>
</div> </div>
</div> </div>
@ -106,7 +106,7 @@
</div> </div>
</div> </div>
<div class="col-1"> <div class="col-1">
<i class="far fa-sm fa-question-circle" title='(Required) - Enter in the network port to connect to the LXD server. Default: 8443'></i> <i class="far fa-sm fa-question-circle" title='(Required) - Enter in the network port to connect to the LXD/Incus server. Default: 8443'></i>
</div> </div>
</div> </div>
@ -133,7 +133,7 @@
</div> </div>
</div> </div>
<div class="col-1"> <div class="col-1">
<i class="far fa-sm fa-question-circle" title='Select whether or not the SSL/TLS certificate of the LXC server must be verified. By default LXD servers use a self-signed certificate. Default value: False'></i> <i class="far fa-sm fa-question-circle" title='Select whether or not the SSL/TLS certificate of the LXC/Incus server must be verified. By default LXD/Incus servers use a self-signed certificate. Default value: False'></i>
</div> </div>
</div> </div>
@ -163,15 +163,17 @@
<div class="col-12"> <div class="col-12">
<p> <p>
Copy the client certificate Copy the client certificate
and paste it into a new file on your remote LXD server such as <strong><em>lxconsole.crt</em></strong>. <br /> and paste it into a new file on your remote LXD/Incus server such as <strong><em>lxconsole.crt</em></strong>. <br />
<pre id="instructionsClientCert">{{ client_crt }}</pre> <pre id="instructionsClientCert">{{ client_crt }}</pre>
</p> </p>
<p>Import the certificate file on your remote LXD server by running the command:<br /> <p>Import the certificate file on your remote LXD/Incus server by running the command:<br />
<code class="text-danger">lxc config trust add lxconsole.crt</code> LXD: <code class="text-danger">lxc config trust add lxconsole.crt</code><br/>
Incus: <code class="text-danger">incus config trust add-certificate lxconsole.crt</code>
</p> </p>
<p> <p>
For LXD servers that are not part of a cluster, use a command to listen for incoming connections, such as:<br /> For LXD/Incus servers that are not part of a cluster, use a command to listen for incoming connections, such as:<br />
<code class="text-danger">lxc config set core.https_address [::]</code> LXD: <code class="text-danger">lxc config set core.https_address [::]</code><br/>
Incus: <code class="text-danger">incus config set core.https_address=[::]:8443</code>
</p> </p>
</div> </div>
</div> </div>
@ -188,7 +190,7 @@
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">LXD Client Certificate</h5> <h5 class="modal-title" id="exampleModalLabel">LXD/Incus Client Certificate</h5>
<button class="close" type="button" data-bs-dismiss="modal" aria-label="Close"> <button class="close" type="button" data-bs-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span> <span aria-hidden="true">×</span>
</button> </button>

View file

@ -126,7 +126,7 @@
</div> </div>
</div> </div>
<div class="col-1"> <div class="col-1">
<i class="far fa-sm fa-question-circle" title='Select whether or not to force using an osd storage pool that is already in use by another LXD instance. Default: false'></i> <i class="far fa-sm fa-question-circle" title='Select whether or not to force using an osd storage pool that is already in use by another LXD/Incus instance. Default: false'></i>
</div> </div>
</div> </div>
<div class="row" id="storagePoolCephOsdPgNumRow" style="display: none;"> <div class="row" id="storagePoolCephOsdPgNumRow" style="display: none;">