Compare commits
No commits in common. "master" and "tests" have entirely different histories.
11
.env.sample
11
.env.sample
|
@ -1,11 +0,0 @@
|
||||||
# Optional, default `mock`
|
|
||||||
#SPOKE_MODEL=shell-scripts
|
|
||||||
# Optional, default `0`
|
|
||||||
#FLASK_DEBUG=0
|
|
||||||
# Optional, default `http://localhost:5000`
|
|
||||||
#BASE_URL=http://localhost:5000
|
|
||||||
# Optional, default `qemu:///system` if you're root, otherwise `qemu:///session`
|
|
||||||
#VIRSH_DEFAULT_CONNECT_URI=qemu:///system
|
|
||||||
#ADMIN_PANEL_ALLOW_EMAIL_ADDRESSES=3wc.capsul@doesthisthing.work
|
|
||||||
# Optional, default no theme
|
|
||||||
#THEME=yolocolo
|
|
|
@ -59,7 +59,6 @@ def create_app(http_client_factory):
|
||||||
LOG_LEVEL=config.get("LOG_LEVEL", "INFO"),
|
LOG_LEVEL=config.get("LOG_LEVEL", "INFO"),
|
||||||
SPOKE_HOST_ID=config.get("SPOKE_HOST_ID", "baikal"),
|
SPOKE_HOST_ID=config.get("SPOKE_HOST_ID", "baikal"),
|
||||||
SPOKE_HOST_TOKEN=config.get("SPOKE_HOST_TOKEN", "changeme"),
|
SPOKE_HOST_TOKEN=config.get("SPOKE_HOST_TOKEN", "changeme"),
|
||||||
SSH_USERNAME=os.environ.get("SSH_USERNAME", default="cyberian"),
|
|
||||||
HUB_TOKEN=config.get("HUB_TOKEN", "changeme"),
|
HUB_TOKEN=config.get("HUB_TOKEN", "changeme"),
|
||||||
|
|
||||||
# https://www.postgresql.org/docs/9.1/libpq-ssl.html#LIBPQ-SSL-SSLMODE-STATEMENTS
|
# https://www.postgresql.org/docs/9.1/libpq-ssl.html#LIBPQ-SSL-SSLMODE-STATEMENTS
|
||||||
|
|
|
@ -62,18 +62,6 @@ def sql_script(f, c):
|
||||||
|
|
||||||
model.connection.commit()
|
model.connection.commit()
|
||||||
|
|
||||||
@bp.cli.command('account-balance')
|
|
||||||
@click.option('-u', help='users email address')
|
|
||||||
@with_appcontext
|
|
||||||
def account_balance(u):
|
|
||||||
vms = get_model().list_vms_for_account(u)
|
|
||||||
payments = get_model().list_payments_for_account(u)
|
|
||||||
click.echo(".")
|
|
||||||
click.echo(".")
|
|
||||||
click.echo(get_account_balance(vms, payments, datetime.utcnow()))
|
|
||||||
click.echo(".")
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@bp.cli.command('cron-task')
|
@bp.cli.command('cron-task')
|
||||||
@with_appcontext
|
@with_appcontext
|
||||||
|
|
|
@ -43,7 +43,7 @@ def init_app(app, is_running_server):
|
||||||
hasSchemaVersionTable = False
|
hasSchemaVersionTable = False
|
||||||
actionWasTaken = False
|
actionWasTaken = False
|
||||||
schemaVersion = 0
|
schemaVersion = 0
|
||||||
desiredSchemaVersion = 19
|
desiredSchemaVersion = 18
|
||||||
|
|
||||||
cursor = connection.cursor()
|
cursor = connection.cursor()
|
||||||
|
|
||||||
|
|
|
@ -1,8 +0,0 @@
|
||||||
DELETE FROM os_images WHERE id = 'guixsystem130';
|
|
||||||
DELETE FROM os_images WHERE id = 'archlinux';
|
|
||||||
UPDATE os_images SET deprecated = FALSE WHERE id = 'guixsystem120';
|
|
||||||
UPDATE os_images SET deprecated = FALSE WHERE id = 'centos7';
|
|
||||||
UPDATE os_images SET deprecated = FALSE WHERE id = 'centos8';
|
|
||||||
UPDATE os_images SET description = 'Ubuntu 20.04 LTS (Fossa)' WHERE id = 'ubuntu20';
|
|
||||||
|
|
||||||
UPDATE schemaversion SET version = 18;
|
|
|
@ -1,12 +0,0 @@
|
||||||
INSERT INTO os_images (id, template_image_file_name, description, deprecated)
|
|
||||||
VALUES ('guixsystem130', 'guixsystem/1.3.0/root.img.qcow2', 'Guix System 1.3.0', FALSE);
|
|
||||||
INSERT INTO os_images (id, template_image_file_name, description, deprecated)
|
|
||||||
VALUES ('archlinux', 'archlinux/root.img.qcow2', 'Arch Linux', FALSE);
|
|
||||||
|
|
||||||
UPDATE os_images SET deprecated = TRUE WHERE id = 'guixsystem120';
|
|
||||||
UPDATE os_images SET deprecated = TRUE WHERE id = 'centos7';
|
|
||||||
UPDATE os_images SET deprecated = TRUE WHERE id = 'centos8';
|
|
||||||
UPDATE os_images SET description = 'Ubuntu 20.04 (Focal)' WHERE id = 'ubuntu20';
|
|
||||||
|
|
||||||
|
|
||||||
UPDATE schemaversion SET version = 19;
|
|
|
@ -7,11 +7,18 @@
|
||||||
<h1>SUPPORT</h1>
|
<h1>SUPPORT</h1>
|
||||||
</div>
|
</div>
|
||||||
<div class="row half-margin">
|
<div class="row half-margin">
|
||||||
<a href="mailto:support@cyberia.club?subject=capsul%20support%20request">support@cyberia.club</a>
|
<a href="mailto:support@cyberia.club?subject=Please%20help!">support@cyberia.club</a>
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block subcontent %}
|
{% block subcontent %}
|
||||||
|
<p>
|
||||||
|
Note: We maintain a searchable archive of all support emails at
|
||||||
|
<a href="https://lists.cyberia.club/~cyberia/support">https://lists.cyberia.club/~cyberia/support</a>
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
If you do not want your mail to appear in a public archive, email <a href="mailto:capsul@cyberia.club?subject=Please%20help!">capsul@cyberia.club</a> instead.
|
||||||
|
</p>
|
||||||
<p>
|
<p>
|
||||||
Please describe your problem or feature request, and we will do our best to get back to you promptly. Thank you very much.
|
Please describe your problem or feature request, and we will do our best to get back to you promptly. Thank you very much.
|
||||||
</p>
|
</p>
|
||||||
|
|
|
@ -12,6 +12,8 @@ class LoginTests(BaseTestCase):
|
||||||
response = client.get(url_for("auth.login"))
|
response = client.get(url_for("auth.login"))
|
||||||
self.assert_200(response)
|
self.assert_200(response)
|
||||||
|
|
||||||
|
# FIXME test generated login link
|
||||||
|
|
||||||
def test_login_magiclink(self):
|
def test_login_magiclink(self):
|
||||||
token, ignoreCaseMatches = get_model().login('test@example.com')
|
token, ignoreCaseMatches = get_model().login('test@example.com')
|
||||||
|
|
||||||
|
|
|
@ -29,6 +29,7 @@ class ConsoleTests(BaseTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super().setUp()
|
super().setUp()
|
||||||
|
|
||||||
|
|
||||||
get_model().cursor.execute("DELETE FROM host_operation")
|
get_model().cursor.execute("DELETE FROM host_operation")
|
||||||
get_model().cursor.execute("DELETE FROM operations")
|
get_model().cursor.execute("DELETE FROM operations")
|
||||||
get_model().cursor.execute("DELETE FROM vm_ssh_host_key")
|
get_model().cursor.execute("DELETE FROM vm_ssh_host_key")
|
||||||
|
@ -47,6 +48,8 @@ class ConsoleTests(BaseTestCase):
|
||||||
for host_id in host_ids:
|
for host_id in host_ids:
|
||||||
get_model().host_heartbeat(host_id)
|
get_model().host_heartbeat(host_id)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def test_index(self):
|
def test_index(self):
|
||||||
self._login('test@example.com')
|
self._login('test@example.com')
|
||||||
with self.client as client:
|
with self.client as client:
|
||||||
|
@ -77,6 +80,7 @@ class ConsoleTests(BaseTestCase):
|
||||||
0
|
0
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def test_create_fails_capacity(self):
|
def test_create_fails_capacity(self):
|
||||||
with self.client as client:
|
with self.client as client:
|
||||||
|
|
||||||
|
@ -158,6 +162,7 @@ class ConsoleTests(BaseTestCase):
|
||||||
url_for("console.index") + f'?created={vm_id}'
|
url_for("console.index") + f'?created={vm_id}'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def test_keys_loads(self):
|
def test_keys_loads(self):
|
||||||
self._login('test@example.com')
|
self._login('test@example.com')
|
||||||
with self.client as client:
|
with self.client as client:
|
||||||
|
@ -210,3 +215,5 @@ class ConsoleTests(BaseTestCase):
|
||||||
'A key with that name already exists',
|
'A key with that name already exists',
|
||||||
category='message'
|
category='message'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -116,4 +116,4 @@ class TestHTTPClient:
|
||||||
# in the same order as the tasks that we passed in -- which were in the same order as online_hosts
|
# in the same order as the tasks that we passed in -- which were in the same order as online_hosts
|
||||||
results = await asyncio.gather(*tasks)
|
results = await asyncio.gather(*tasks)
|
||||||
|
|
||||||
return results
|
return results
|
|
@ -15,8 +15,8 @@ services:
|
||||||
- "5000:5000"
|
- "5000:5000"
|
||||||
environment:
|
environment:
|
||||||
- "POSTGRES_CONNECTION_PARAMETERS=host=db port=5432 user=capsul password=capsul dbname=capsul"
|
- "POSTGRES_CONNECTION_PARAMETERS=host=db port=5432 user=capsul password=capsul dbname=capsul"
|
||||||
- SPOKE_MODEL
|
- SPOKE_MODEL=shell-scripts
|
||||||
- FLASK_DEBUG
|
#- FLASK_DEBUG=1
|
||||||
- BASE_URL=http://localhost:5000
|
- BASE_URL=http://localhost:5000
|
||||||
- ADMIN_PANEL_ALLOW_EMAIL_ADDRESSES=3wc.capsul@doesthisthing.work
|
- ADMIN_PANEL_ALLOW_EMAIL_ADDRESSES=3wc.capsul@doesthisthing.work
|
||||||
- VIRSH_DEFAULT_CONNECT_URI=qemu:///system
|
- VIRSH_DEFAULT_CONNECT_URI=qemu:///system
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
Create a `.env` file to set up the application configuration:
|
Create a `.env` file to set up the application configuration:
|
||||||
|
|
||||||
```
|
```
|
||||||
cp .env.sample .env
|
|
||||||
nano .env
|
nano .env
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue