Compare commits
60 Commits
cyberia-pr
...
cfb323bf60
Author | SHA1 | Date | |
---|---|---|---|
cfb323bf60 | |||
8c7197f118 | |||
fb83f52162 | |||
982556a2c5 | |||
13646e64da | |||
67149f437a | |||
308ac05fe6 | |||
c378c2b287 | |||
5367822747 | |||
e295b4420c | |||
e4180b8306 | |||
5cd5126039 | |||
f8e9ab2482 | |||
487a1ac0a3 | |||
71344fbf4d | |||
6f3ecf991d | |||
40aa3bccd3 | |||
bcc3f20b27 | |||
8bd3971545 | |||
c639899cd0 | |||
a47c430855 | |||
d5362897df | |||
a52d183f2e | |||
73042d1705 | |||
d3078fc5ce | |||
d60238f6f0 | |||
ab55146d41 | |||
7191213646 | |||
8c802a977a | |||
929aa29663 | |||
61beee8d3b | |||
8586b85095 | |||
b2b78e0015 | |||
d6f4be8197 | |||
5d3d0a1c5e | |||
fc7e264178 | |||
157e81e6e5 | |||
97f9486ea3 | |||
4b90a6c7ae | |||
adc3342a8c | |||
f8bbdcc3c5 | |||
1133caa8a4 | |||
1f384f34b5 | |||
c25d85bbdd | |||
0f4ac8e444 | |||
3cf501a393 | |||
180efa01af | |||
f5c079ffc2 | |||
0e5dfe6bde | |||
2adbb8d94c | |||
8446d11720 | |||
a580b04659 | |||
2e6894ad14 | |||
2e6c6517f3 | |||
be6c1b38b7 | |||
aa8e129913 | |||
71e09807a7 | |||
4816170c03 | |||
6af241e8be | |||
c8ec53f207 |
13
.drone.yml
Normal file
13
.drone.yml
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
---
|
||||||
|
kind: pipeline
|
||||||
|
name: publish docker image
|
||||||
|
steps:
|
||||||
|
- name: build and publish
|
||||||
|
image: plugins/docker
|
||||||
|
settings:
|
||||||
|
username:
|
||||||
|
from_secret: docker_reg_username_3wc
|
||||||
|
password:
|
||||||
|
from_secret: docker_reg_passwd_3wc
|
||||||
|
repo: 3wordchant/capsul-flask
|
||||||
|
tags: ${DRONE_COMMIT_BRANCH}
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,6 +1,5 @@
|
|||||||
notes.txt
|
notes.txt
|
||||||
.env
|
.env
|
||||||
.env.bak
|
|
||||||
.vscode
|
.vscode
|
||||||
|
|
||||||
*.pyc
|
*.pyc
|
||||||
|
48
Dockerfile
Normal file
48
Dockerfile
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
FROM python:3.8-alpine as build
|
||||||
|
|
||||||
|
RUN apk add --no-cache \
|
||||||
|
build-base \
|
||||||
|
gcc \
|
||||||
|
gettext \
|
||||||
|
git \
|
||||||
|
jpeg-dev \
|
||||||
|
libffi-dev \
|
||||||
|
libjpeg \
|
||||||
|
musl-dev \
|
||||||
|
postgresql-dev \
|
||||||
|
python3-dev \
|
||||||
|
zlib-dev
|
||||||
|
|
||||||
|
RUN mkdir -p /app/{code,venv}
|
||||||
|
WORKDIR /app/code
|
||||||
|
COPY Pipfile Pipfile.lock /app/code/
|
||||||
|
|
||||||
|
RUN python3 -m venv /app/venv
|
||||||
|
RUN pip install pipenv setuptools
|
||||||
|
ENV PATH="/app/venv/bin:$PATH" VIRTUAL_ENV="/app/venv"
|
||||||
|
RUN pip install wheel cppy
|
||||||
|
# Install dependencies into the virtual environment with Pipenv
|
||||||
|
RUN pipenv install --deploy --verbose
|
||||||
|
|
||||||
|
FROM python:3.8-alpine
|
||||||
|
|
||||||
|
RUN apk add --no-cache \
|
||||||
|
cloud-utils \
|
||||||
|
libjpeg \
|
||||||
|
libpq \
|
||||||
|
libstdc++ \
|
||||||
|
libvirt-client \
|
||||||
|
openssh-client \
|
||||||
|
virt-install
|
||||||
|
|
||||||
|
COPY . /app/code/
|
||||||
|
WORKDIR /app/code
|
||||||
|
|
||||||
|
COPY --from=build /app/venv /app/venv
|
||||||
|
ENV PATH="/app/venv/bin:$PATH" VIRTUAL_ENV="/app/venv"
|
||||||
|
|
||||||
|
CMD ["gunicorn", "--bind", "0.0.0.0:5000", "-k", "gevent", "--worker-connections", "1000", "app:app"]
|
||||||
|
|
||||||
|
VOLUME /app/code
|
||||||
|
|
||||||
|
EXPOSE 5000
|
@ -2,6 +2,7 @@ import logging
|
|||||||
from logging.config import dictConfig as logging_dict_config
|
from logging.config import dictConfig as logging_dict_config
|
||||||
|
|
||||||
import atexit
|
import atexit
|
||||||
|
import jinja2
|
||||||
import os
|
import os
|
||||||
import hashlib
|
import hashlib
|
||||||
import requests
|
import requests
|
||||||
@ -26,8 +27,24 @@ class StdoutMockFlaskMail:
|
|||||||
def send(self, message: Message):
|
def send(self, message: Message):
|
||||||
current_app.logger.info(f"Email would have been sent if configured:\n\nto: {','.join(message.recipients)}\nsubject: {message.subject}\nbody:\n\n{message.body}\n\n")
|
current_app.logger.info(f"Email would have been sent if configured:\n\nto: {','.join(message.recipients)}\nsubject: {message.subject}\nbody:\n\n{message.body}\n\n")
|
||||||
|
|
||||||
|
|
||||||
load_dotenv(find_dotenv())
|
load_dotenv(find_dotenv())
|
||||||
|
|
||||||
|
for var_name in [
|
||||||
|
"SPOKE_HOST_TOKEN", "HUB_TOKEN", "STRIPE_SECRET_KEY",
|
||||||
|
"BTCPAY_PRIVATE_KEY", "MAIL_PASSWORD"
|
||||||
|
]:
|
||||||
|
var = os.environ.get(f"{var_name}_FILE")
|
||||||
|
if not var:
|
||||||
|
continue
|
||||||
|
|
||||||
|
if not os.path.isfile(var):
|
||||||
|
continue
|
||||||
|
|
||||||
|
with open(var) as secret_file:
|
||||||
|
os.environ[var_name] = secret_file.read().rstrip('\n')
|
||||||
|
del os.environ[f"{var_name}_FILE"]
|
||||||
|
|
||||||
app = Flask(__name__)
|
app = Flask(__name__)
|
||||||
|
|
||||||
app.config.from_mapping(
|
app.config.from_mapping(
|
||||||
@ -71,7 +88,9 @@ app.config.from_mapping(
|
|||||||
#STRIPE_WEBHOOK_SECRET=os.environ.get("STRIPE_WEBHOOK_SECRET", default="")
|
#STRIPE_WEBHOOK_SECRET=os.environ.get("STRIPE_WEBHOOK_SECRET", default="")
|
||||||
|
|
||||||
BTCPAY_PRIVATE_KEY=os.environ.get("BTCPAY_PRIVATE_KEY", default="").replace("\\n", "\n"),
|
BTCPAY_PRIVATE_KEY=os.environ.get("BTCPAY_PRIVATE_KEY", default="").replace("\\n", "\n"),
|
||||||
BTCPAY_URL=os.environ.get("BTCPAY_URL", default="")
|
BTCPAY_URL=os.environ.get("BTCPAY_URL", default=""),
|
||||||
|
|
||||||
|
THEME=os.environ.get("THEME", default="")
|
||||||
)
|
)
|
||||||
|
|
||||||
app.config['HUB_URL'] = os.environ.get("HUB_URL", default=app.config['BASE_URL'])
|
app.config['HUB_URL'] = os.environ.get("HUB_URL", default=app.config['BASE_URL'])
|
||||||
@ -142,12 +161,8 @@ app.config['HTTP_CLIENT'] = MyHTTPClient(timeout_seconds=int(app.config['INTERNA
|
|||||||
app.config['BTCPAY_ENABLED'] = False
|
app.config['BTCPAY_ENABLED'] = False
|
||||||
if app.config['BTCPAY_URL'] != "":
|
if app.config['BTCPAY_URL'] != "":
|
||||||
try:
|
try:
|
||||||
response = requests.get(app.config['BTCPAY_URL'])
|
app.config['BTCPAY_CLIENT'] = btcpay.Client(api_uri=app.config['BTCPAY_URL'], pem=app.config['BTCPAY_PRIVATE_KEY'])
|
||||||
if response.status_code == 200:
|
app.config['BTCPAY_ENABLED'] = True
|
||||||
app.config['BTCPAY_CLIENT'] = btcpay.Client(api_uri=app.config['BTCPAY_URL'], pem=app.config['BTCPAY_PRIVATE_KEY'])
|
|
||||||
app.config['BTCPAY_ENABLED'] = True
|
|
||||||
else:
|
|
||||||
app.logger.warning(f"Can't reach BTCPAY_URL {app.config['BTCPAY_URL']}: Response status code: {response.status_code}. Capsul will work fine except cryptocurrency payments will not work.")
|
|
||||||
except:
|
except:
|
||||||
app.logger.warning("unable to create btcpay client. Capsul will work fine except cryptocurrency payments will not work. The error was: " + my_exec_info_message(sys.exc_info()))
|
app.logger.warning("unable to create btcpay client. Capsul will work fine except cryptocurrency payments will not work. The error was: " + my_exec_info_message(sys.exc_info()))
|
||||||
|
|
||||||
@ -158,6 +173,14 @@ is_running_server = ('flask run' in command_line) or ('gunicorn' in command_line
|
|||||||
|
|
||||||
app.logger.info(f"is_running_server: {is_running_server}")
|
app.logger.info(f"is_running_server: {is_running_server}")
|
||||||
|
|
||||||
|
if app.config['THEME'] != "":
|
||||||
|
my_loader = jinja2.ChoiceLoader([
|
||||||
|
jinja2.FileSystemLoader(
|
||||||
|
[os.path.join('capsulflask', 'theme', app.config['THEME']),
|
||||||
|
'capsulflask/templates']),
|
||||||
|
])
|
||||||
|
app.jinja_loader = my_loader
|
||||||
|
|
||||||
if app.config['HUB_MODE_ENABLED']:
|
if app.config['HUB_MODE_ENABLED']:
|
||||||
|
|
||||||
if app.config['HUB_MODEL'] == "capsul-flask":
|
if app.config['HUB_MODEL'] == "capsul-flask":
|
||||||
|
@ -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
|
||||||
|
@ -199,14 +199,6 @@ def create():
|
|||||||
capacity_avaliable = current_app.config["HUB_MODEL"].capacity_avaliable(512*1024*1024)
|
capacity_avaliable = current_app.config["HUB_MODEL"].capacity_avaliable(512*1024*1024)
|
||||||
errors = list()
|
errors = list()
|
||||||
|
|
||||||
affordable_vm_sizes = dict()
|
|
||||||
for key, vm_size in vm_sizes.items():
|
|
||||||
# if a user deposits $7.50 and then creates an f1-s vm which costs 7.50 a month,
|
|
||||||
# then they have to delete the vm and re-create it, they will not be able to, they will have to pay again.
|
|
||||||
# so for UX it makes a lot of sense to give a small margin of 25 cents for usability sake
|
|
||||||
if vm_size["dollars_per_month"] <= account_balance+0.25:
|
|
||||||
affordable_vm_sizes[key] = vm_size
|
|
||||||
|
|
||||||
if request.method == "POST":
|
if request.method == "POST":
|
||||||
if "csrf-token" not in request.form or request.form['csrf-token'] != session['csrf-token']:
|
if "csrf-token" not in request.form or request.form['csrf-token'] != session['csrf-token']:
|
||||||
return abort(418, f"u want tea")
|
return abort(418, f"u want tea")
|
||||||
@ -217,8 +209,6 @@ def create():
|
|||||||
errors.append("Size is required")
|
errors.append("Size is required")
|
||||||
elif size not in vm_sizes:
|
elif size not in vm_sizes:
|
||||||
errors.append(f"Invalid size {size}")
|
errors.append(f"Invalid size {size}")
|
||||||
elif size not in affordable_vm_sizes:
|
|
||||||
errors.append(f"Your account must have enough credit to run an {size} for 1 month before you will be allowed to create it")
|
|
||||||
|
|
||||||
if not os:
|
if not os:
|
||||||
errors.append("OS is required")
|
errors.append("OS is required")
|
||||||
@ -270,6 +260,13 @@ def create():
|
|||||||
|
|
||||||
return redirect(f"{url_for('console.index')}?created={id}")
|
return redirect(f"{url_for('console.index')}?created={id}")
|
||||||
|
|
||||||
|
affordable_vm_sizes = dict()
|
||||||
|
for key, vm_size in vm_sizes.items():
|
||||||
|
# if a user deposits $7.50 and then creates an f1-s vm which costs 7.50 a month,
|
||||||
|
# then they have to delete the vm and re-create it, they will not be able to, they will have to pay again.
|
||||||
|
# so for UX it makes a lot of sense to give a small margin of 25 cents for usability sake
|
||||||
|
if vm_size["dollars_per_month"] <= account_balance+0.25:
|
||||||
|
affordable_vm_sizes[key] = vm_size
|
||||||
|
|
||||||
for error in errors:
|
for error in errors:
|
||||||
flash(error)
|
flash(error)
|
||||||
|
@ -43,7 +43,7 @@ def init_app(app, is_running_server):
|
|||||||
hasSchemaVersionTable = False
|
hasSchemaVersionTable = False
|
||||||
actionWasTaken = False
|
actionWasTaken = False
|
||||||
schemaVersion = 0
|
schemaVersion = 0
|
||||||
desiredSchemaVersion = 20
|
desiredSchemaVersion = 18
|
||||||
|
|
||||||
cursor = connection.cursor()
|
cursor = connection.cursor()
|
||||||
|
|
||||||
|
@ -178,4 +178,4 @@ def on_create_claimed(payload, host_id):
|
|||||||
network_name=payload['network_name'],
|
network_name=payload['network_name'],
|
||||||
public_ipv4=payload['public_ipv4'],
|
public_ipv4=payload['public_ipv4'],
|
||||||
ssh_authorized_keys=list(map(lambda x: x["name"], payload['ssh_authorized_keys'])),
|
ssh_authorized_keys=list(map(lambda x: x["name"], payload['ssh_authorized_keys'])),
|
||||||
)
|
)
|
||||||
|
@ -227,12 +227,13 @@ class CapsulFlaskHub(VirtualizationInterface):
|
|||||||
except:
|
except:
|
||||||
# no need to do anything here since if it cant be parsed then generic_operation will handle it.
|
# no need to do anything here since if it cant be parsed then generic_operation will handle it.
|
||||||
pass
|
pass
|
||||||
|
|
||||||
assigned_hosts_string = ", ".join(assigned_hosts)
|
|
||||||
if number_of_assigned != 1:
|
|
||||||
raise ValueError(f"expected create capsul operation {operation_id} to be assigned to one host, it was assigned to {number_of_assigned} ({assigned_hosts_string})")
|
|
||||||
if error_message != "":
|
if error_message != "":
|
||||||
raise ValueError(f"create capsul operation {operation_id} on {assigned_hosts_string} failed with {error_message}")
|
raise ValueError(f"create capsul operation {operation_id} on {assigned_hosts} failed with {error_message}")
|
||||||
|
|
||||||
|
if number_of_assigned != 1:
|
||||||
|
assigned_hosts_string = ", ".join(assigned_hosts)
|
||||||
|
raise ValueError(f"expected create capsul operation {operation_id} to be assigned to one host, it was assigned to {number_of_assigned} ({assigned_hosts_string})")
|
||||||
|
|
||||||
|
|
||||||
def destroy(self, email: str, id: str):
|
def destroy(self, email: str, id: str):
|
||||||
|
@ -58,19 +58,14 @@ def btcpay_payment():
|
|||||||
dollars = result[1]
|
dollars = result[1]
|
||||||
|
|
||||||
if len(errors) == 0:
|
if len(errors) == 0:
|
||||||
try:
|
invoice = current_app.config['BTCPAY_CLIENT'].create_invoice(dict(
|
||||||
invoice = current_app.config['BTCPAY_CLIENT'].create_invoice(dict(
|
price=float(dollars),
|
||||||
price=float(dollars),
|
currency="USD",
|
||||||
currency="USD",
|
itemDesc="Capsul Cloud Compute",
|
||||||
itemDesc="Capsul Cloud Compute",
|
transactionSpeed="high",
|
||||||
transactionSpeed="high",
|
redirectURL=f"{current_app.config['BASE_URL']}/console/account-balance",
|
||||||
redirectURL=f"{current_app.config['BASE_URL']}/console/account-balance",
|
notificationURL=f"{current_app.config['BASE_URL']}/payment/btcpay/webhook"
|
||||||
notificationURL=f"{current_app.config['BASE_URL']}/payment/btcpay/webhook"
|
))
|
||||||
))
|
|
||||||
except:
|
|
||||||
current_app.logger.error(f"An error occurred while attempting to reach BTCPay Server: {my_exec_info_message(sys.exc_info())}")
|
|
||||||
flash("An error occurred while attempting to reach BTCPay Server.")
|
|
||||||
return redirect(url_for("console.account_balance"))
|
|
||||||
|
|
||||||
current_app.logger.info(f"created btcpay invoice: {invoice}")
|
current_app.logger.info(f"created btcpay invoice: {invoice}")
|
||||||
|
|
||||||
|
@ -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;
|
|
@ -1,21 +0,0 @@
|
|||||||
|
|
||||||
ALTER TABLE host_network ALTER CONSTRAINT host_network_host_fkey NOT DEFERRABLE;
|
|
||||||
ALTER TABLE host_operation ALTER CONSTRAINT host_operation_host_fkey NOT DEFERRABLE;
|
|
||||||
ALTER TABLE host_operation ALTER CONSTRAINT host_operation_operation_fkey NOT DEFERRABLE;
|
|
||||||
ALTER TABLE login_tokens ALTER CONSTRAINT login_tokens_email_fkey NOT DEFERRABLE;
|
|
||||||
ALTER TABLE operations ALTER CONSTRAINT operations_email_fkey NOT DEFERRABLE;
|
|
||||||
ALTER TABLE payment_sessions ALTER CONSTRAINT payment_sessions_email_fkey NOT DEFERRABLE;
|
|
||||||
ALTER TABLE payments ALTER CONSTRAINT payments_email_fkey NOT DEFERRABLE;
|
|
||||||
ALTER TABLE ssh_public_keys ALTER CONSTRAINT ssh_public_keys_email_fkey NOT DEFERRABLE;
|
|
||||||
ALTER TABLE unresolved_btcpay_invoices ALTER CONSTRAINT unresolved_btcpay_invoices_email_fkey NOT DEFERRABLE;
|
|
||||||
ALTER TABLE unresolved_btcpay_invoices ALTER CONSTRAINT unresolved_btcpay_invoices_email_payment_id_fkey NOT DEFERRABLE;
|
|
||||||
ALTER TABLE vm_ssh_authorized_key ALTER CONSTRAINT vm_ssh_public_key_email_ssh_public_key_name_fkey NOT DEFERRABLE;
|
|
||||||
ALTER TABLE vm_ssh_authorized_key ALTER CONSTRAINT vm_ssh_public_key_email_vm_id_fkey NOT DEFERRABLE;
|
|
||||||
ALTER TABLE vm_ssh_host_key ALTER CONSTRAINT vm_ssh_host_key_email_vm_id_fkey NOT DEFERRABLE;
|
|
||||||
ALTER TABLE vms ALTER CONSTRAINT vms_email_fkey NOT DEFERRABLE;
|
|
||||||
ALTER TABLE vms ALTER CONSTRAINT vms_host_network_name_fkey NOT DEFERRABLE;
|
|
||||||
ALTER TABLE vms ALTER CONSTRAINT vms_host_fkey NOT DEFERRABLE;
|
|
||||||
ALTER TABLE vms ALTER CONSTRAINT vms_os_fkey NOT DEFERRABLE;
|
|
||||||
ALTER TABLE vms ALTER CONSTRAINT vms_size_fkey NOT DEFERRABLE;
|
|
||||||
|
|
||||||
UPDATE schemaversion SET version = 19;
|
|
@ -1,21 +0,0 @@
|
|||||||
|
|
||||||
ALTER TABLE host_network ALTER CONSTRAINT host_network_host_fkey DEFERRABLE INITIALLY DEFERRED;
|
|
||||||
ALTER TABLE host_operation ALTER CONSTRAINT host_operation_host_fkey DEFERRABLE INITIALLY DEFERRED;
|
|
||||||
ALTER TABLE host_operation ALTER CONSTRAINT host_operation_operation_fkey DEFERRABLE INITIALLY DEFERRED;
|
|
||||||
ALTER TABLE login_tokens ALTER CONSTRAINT login_tokens_email_fkey DEFERRABLE INITIALLY DEFERRED;
|
|
||||||
ALTER TABLE operations ALTER CONSTRAINT operations_email_fkey DEFERRABLE INITIALLY DEFERRED;
|
|
||||||
ALTER TABLE payment_sessions ALTER CONSTRAINT payment_sessions_email_fkey DEFERRABLE INITIALLY DEFERRED;
|
|
||||||
ALTER TABLE payments ALTER CONSTRAINT payments_email_fkey DEFERRABLE INITIALLY DEFERRED;
|
|
||||||
ALTER TABLE ssh_public_keys ALTER CONSTRAINT ssh_public_keys_email_fkey DEFERRABLE INITIALLY DEFERRED;
|
|
||||||
ALTER TABLE unresolved_btcpay_invoices ALTER CONSTRAINT unresolved_btcpay_invoices_email_fkey DEFERRABLE INITIALLY DEFERRED;
|
|
||||||
ALTER TABLE unresolved_btcpay_invoices ALTER CONSTRAINT unresolved_btcpay_invoices_email_payment_id_fkey DEFERRABLE INITIALLY DEFERRED;
|
|
||||||
ALTER TABLE vm_ssh_authorized_key ALTER CONSTRAINT vm_ssh_public_key_email_ssh_public_key_name_fkey DEFERRABLE INITIALLY DEFERRED;
|
|
||||||
ALTER TABLE vm_ssh_authorized_key ALTER CONSTRAINT vm_ssh_public_key_email_vm_id_fkey DEFERRABLE INITIALLY DEFERRED;
|
|
||||||
ALTER TABLE vm_ssh_host_key ALTER CONSTRAINT vm_ssh_host_key_email_vm_id_fkey DEFERRABLE INITIALLY DEFERRED;
|
|
||||||
ALTER TABLE vms ALTER CONSTRAINT vms_email_fkey DEFERRABLE INITIALLY DEFERRED;
|
|
||||||
ALTER TABLE vms ALTER CONSTRAINT vms_host_network_name_fkey DEFERRABLE INITIALLY DEFERRED;
|
|
||||||
ALTER TABLE vms ALTER CONSTRAINT vms_host_fkey DEFERRABLE INITIALLY DEFERRED;
|
|
||||||
ALTER TABLE vms ALTER CONSTRAINT vms_os_fkey DEFERRABLE INITIALLY DEFERRED;
|
|
||||||
ALTER TABLE vms ALTER CONSTRAINT vms_size_fkey DEFERRABLE INITIALLY DEFERRED;
|
|
||||||
|
|
||||||
UPDATE schemaversion SET version = 20;
|
|
@ -3,7 +3,7 @@
|
|||||||
# check available RAM and IPv4s
|
# check available RAM and IPv4s
|
||||||
|
|
||||||
ram_bytes_to_allocate="$1"
|
ram_bytes_to_allocate="$1"
|
||||||
ram_bytes_available=$(grep -E "^(size|memory_available_bytes)" /proc/spl/kstat/zfs/arcstats | awk '{sum+=$3} END {printf "%.0f", sum}')
|
ram_bytes_available="$(($(grep Available /proc/meminfo | grep -o '[0-9]*') * 1024))"
|
||||||
ram_bytes_remainder="$((ram_bytes_available - ram_bytes_to_allocate))"
|
ram_bytes_remainder="$((ram_bytes_available - ram_bytes_to_allocate))"
|
||||||
|
|
||||||
if echo "$ram_bytes_to_allocate" | grep -vqE "^[0-9]+$"; then
|
if echo "$ram_bytes_to_allocate" | grep -vqE "^[0-9]+$"; then
|
||||||
@ -11,8 +11,8 @@ if echo "$ram_bytes_to_allocate" | grep -vqE "^[0-9]+$"; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 20GB
|
# 0.25GB
|
||||||
if [ "$ram_bytes_remainder" -le $((20 * 1024 * 1024 * 1024)) ]; then
|
if [ "$ram_bytes_remainder" -le $((1 * 1024 * 1024 * 1024 / 4)) ]; then
|
||||||
echo "VM is requesting more RAM than $(hostname -f) has available."
|
echo "VM is requesting more RAM than $(hostname -f) has available."
|
||||||
echo "Bytes requested: $ram_bytes_to_allocate"
|
echo "Bytes requested: $ram_bytes_to_allocate"
|
||||||
echo "Bytes available: $ram_bytes_available"
|
echo "Bytes available: $ram_bytes_available"
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
|
|
||||||
vmname="$1"
|
vmname="$1"
|
||||||
template_file="/tank/img/$2"
|
template_file="/tank/img/$2"
|
||||||
|
qemu_tank_dir="/tank"
|
||||||
vcpus="$3"
|
vcpus="$3"
|
||||||
memory="$4"
|
memory="$4"
|
||||||
pubkeys="$5"
|
pubkeys="$5"
|
||||||
@ -50,40 +51,40 @@ if echo "$public_ipv4" | grep -vqE "^[0-9.]+$"; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
disk="/tank/vm/$vmname.qcow2"
|
disk="$vmname.qcow2"
|
||||||
cdrom="/tank/vm/$vmname.iso"
|
cdrom="$vmname.iso"
|
||||||
xml="/tank/vm/$vmname.xml"
|
xml="$vmname.xml"
|
||||||
|
|
||||||
if [ -f /tank/vm/$vmname.qcow2 ]; then
|
if [ -f /tank/vm/$vmname.qcow2 ]; then
|
||||||
echo "Randomly generated name matched an existing VM! Odds are like one in a billion. Buy a lotto ticket."
|
echo "Randomly generated name matched an existing VM! Odds are like one in a billion. Buy a lotto ticket."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cp "$template_file" "$disk"
|
cp "$template_file" "/tank/vm/$disk"
|
||||||
cp /tank/config/cyberia-cloudinit.yml /tmp/cloudinit.yml
|
cp /tank/config/cyberia-cloudinit.yml /tmp/cloudinit.yml
|
||||||
echo "$pubkeys" | while IFS= read -r line; do
|
echo "$pubkeys" | while IFS= read -r line; do
|
||||||
echo " - $line" >> /tmp/cloudinit.yml
|
echo " - $line" >> /tmp/cloudinit.yml
|
||||||
done
|
done
|
||||||
|
|
||||||
cloud-localds "$cdrom" /tmp/cloudinit.yml
|
cloud-localds "/tank/vm/$cdrom" /tmp/cloudinit.yml
|
||||||
|
|
||||||
qemu-img resize "$disk" "$root_volume_size"
|
qemu-img resize "/tank/vm/$disk" "$root_volume_size"
|
||||||
virt-install \
|
virt-install \
|
||||||
--memory "$memory" \
|
--memory "$memory" \
|
||||||
--vcpus "$vcpus" \
|
--vcpus "$vcpus" \
|
||||||
--name "$vmname" \
|
--name "$vmname" \
|
||||||
--disk "$disk",bus=virtio \
|
--disk "$qemu_tank_dir/vm/$disk",bus=virtio \
|
||||||
--disk "$cdrom",device=cdrom \
|
--disk "$qemu_tank_dir/vm/$cdrom",device=cdrom \
|
||||||
--os-type Linux \
|
--os-type Linux \
|
||||||
--os-variant generic \
|
--os-variant generic \
|
||||||
--virt-type kvm \
|
--virt-type kvm \
|
||||||
--graphics vnc,listen=127.0.0.1 \
|
--graphics vnc,listen=127.0.0.1 \
|
||||||
--network network=$network_name,filterref=clean-traffic,model=virtio \
|
--network network=$network_name,model=virtio \
|
||||||
--import \
|
--import \
|
||||||
--print-xml > "$xml"
|
--print-xml > "/tank/vm/$xml"
|
||||||
|
|
||||||
chmod 0600 "$xml" "$disk" "$cdrom"
|
chmod 0600 "/tank/vm/$xml" "/tank/vm/$disk" "/tank/vm/$cdrom"
|
||||||
virsh define "$xml"
|
virsh define "/tank/vm/$xml"
|
||||||
virsh start "$vmname"
|
virsh start "$vmname"
|
||||||
|
|
||||||
echo "success"
|
echo "success"
|
||||||
|
@ -182,10 +182,7 @@ def handle_destroy(operation_id, request_body):
|
|||||||
return abort(400, f"bad request; email is required for destroy")
|
return abort(400, f"bad request; email is required for destroy")
|
||||||
|
|
||||||
try:
|
try:
|
||||||
vm = current_app.config['SPOKE_MODEL'].get(request_body['id'], False)
|
current_app.config['SPOKE_MODEL'].destroy(id=request_body['id'], email=request_body['email'])
|
||||||
current_app.logger.warning(f"destroy {request_body['id']} was called for {request_body['email']}, however the vm does not exist. returning success. ")
|
|
||||||
if vm is not None:
|
|
||||||
current_app.config['SPOKE_MODEL'].destroy(id=request_body['id'], email=request_body['email'])
|
|
||||||
except:
|
except:
|
||||||
error_message = my_exec_info_message(sys.exc_info())
|
error_message = my_exec_info_message(sys.exc_info())
|
||||||
params = f"email='{request_body['email'] if 'email' in request_body else 'KeyError'}', "
|
params = f"email='{request_body['email'] if 'email' in request_body else 'KeyError'}', "
|
||||||
|
BIN
capsulflask/static/favicon.yolocolo.ico
Normal file
BIN
capsulflask/static/favicon.yolocolo.ico
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.7 KiB |
BIN
capsulflask/static/icon.yolocolo.png
Normal file
BIN
capsulflask/static/icon.yolocolo.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.2 KiB |
@ -1,8 +1,8 @@
|
|||||||
html {
|
html {
|
||||||
color: #bdc7b8;
|
color: #241e1e;
|
||||||
font: calc(0.40rem + 1vmin) monospace;
|
font: calc(0.40rem + 1vmin) monospace;
|
||||||
overflow-y: scroll;
|
overflow-y: scroll;
|
||||||
background-color: #241e1e;
|
background-color: #bdc7b8;
|
||||||
}
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
@ -19,8 +19,8 @@ body {
|
|||||||
}
|
}
|
||||||
|
|
||||||
a {
|
a {
|
||||||
color:#6CF;
|
color:#00517a;
|
||||||
text-shadow: 1px 1px 0px #000c;
|
text-shadow: 1px 1px 0px #eee;
|
||||||
}
|
}
|
||||||
|
|
||||||
a.no-shadow {
|
a.no-shadow {
|
||||||
@ -28,7 +28,7 @@ a.no-shadow {
|
|||||||
}
|
}
|
||||||
|
|
||||||
a:hover, a:active, a:visited {
|
a:hover, a:active, a:visited {
|
||||||
color: #b5bd68;
|
color: #323417;
|
||||||
}
|
}
|
||||||
|
|
||||||
.nav-links a {
|
.nav-links a {
|
||||||
@ -59,11 +59,11 @@ h1, h2, h3, h4, h5 {
|
|||||||
margin: initial;
|
margin: initial;
|
||||||
padding: initial;
|
padding: initial;
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
text-shadow: 2px 2px 0px #0007;
|
text-shadow: 2px 2px 0px #eee;
|
||||||
}
|
}
|
||||||
|
|
||||||
main {
|
main {
|
||||||
border: 1px dashed #bdc7b8;
|
border: 1px dashed #241e1e;
|
||||||
padding: 1rem;
|
padding: 1rem;
|
||||||
margin-bottom: 2em;
|
margin-bottom: 2em;
|
||||||
|
|
||||||
@ -143,7 +143,7 @@ input, textarea, select, label {
|
|||||||
input, select, textarea {
|
input, select, textarea {
|
||||||
outline: 0;
|
outline: 0;
|
||||||
padding: 0.25em 0.5em;
|
padding: 0.25em 0.5em;
|
||||||
color: #bdc7b8;
|
color: #241e1e;
|
||||||
background-color: #bdc7b805;
|
background-color: #bdc7b805;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
35
capsulflask/static/style.yolocolo.css
Normal file
35
capsulflask/static/style.yolocolo.css
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
html {
|
||||||
|
color: #241e1e !important;
|
||||||
|
background-color: #bdc7b8 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
a {
|
||||||
|
color:#00517a !important;
|
||||||
|
text-shadow: 1px 1px 0px #eee !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
a:hover, a:active, a:visited {
|
||||||
|
color: #323417 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-links a {
|
||||||
|
text-shadow: 2px 2px 0px #eee !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
h1, h2, h3, h4, h5 {
|
||||||
|
text-shadow: 2px 2px 0px #eee;
|
||||||
|
}
|
||||||
|
|
||||||
|
main {
|
||||||
|
border: 1px dashed #241e1e !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
input, select, textarea {
|
||||||
|
color: #241e1e !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
th {
|
||||||
|
border-right: 1px solid #eee !important;
|
||||||
|
text-align: left !important;
|
||||||
|
}
|
@ -49,8 +49,6 @@
|
|||||||
{% if btcpay_enabled %}
|
{% if btcpay_enabled %}
|
||||||
<li><a href="/payment/btcpay">Add funds with Bitcoin/Litecoin/Monero (btcpay)</a></li>
|
<li><a href="/payment/btcpay">Add funds with Bitcoin/Litecoin/Monero (btcpay)</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<li>Cash: email <a href="mailto:treasurer@cyberia.club">treasurer@cyberia.club</a></li>
|
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
<nav>
|
<nav>
|
||||||
<div class="row justify-space-between half-margin">
|
<div class="row justify-space-between half-margin">
|
||||||
<div>
|
<div>
|
||||||
<a href="/"><b>Capsul</b></a>💊
|
🦉 <a href="/"><b>YOLOCOLO</b></a>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
|
|
||||||
@ -27,7 +27,6 @@
|
|||||||
<div class="row justify-center half-margin wrap nav-links">
|
<div class="row justify-center half-margin wrap nav-links">
|
||||||
<a href="/pricing">Pricing</a>
|
<a href="/pricing">Pricing</a>
|
||||||
<a href="/faq">FAQ</a>
|
<a href="/faq">FAQ</a>
|
||||||
<a href="/changelog">Changelog</a>
|
|
||||||
|
|
||||||
{% if session["account"] %}
|
{% if session["account"] %}
|
||||||
<a href="/console">Capsuls</a>
|
<a href="/console">Capsuls</a>
|
||||||
@ -47,11 +46,12 @@
|
|||||||
</main>
|
</main>
|
||||||
{% block subcontent %}{% endblock %}
|
{% block subcontent %}{% endblock %}
|
||||||
<footer>
|
<footer>
|
||||||
(c) Attribution-ShareAlike 4.0 International <br/>
|
This server runs <a
|
||||||
A service by Cyberia Computer Club 2020-<span class="bigtext">∞</span> <br/>
|
href="https://giit.cyberia.club/~forest/capsul-flask">capsul-flask</a> by
|
||||||
<br/>
|
Cyberia Computer Club, available under the <a
|
||||||
<br/>
|
href="https://creativecommons.org/licenses/by-sa/4.0/">Attribution-ShareAlike
|
||||||
<a href="https://giit.cyberia.club/~forest/capsul-flask/tree/master/capsulflask{% block pagesource %}{% endblock %}">View page source</a>
|
4.0 International</a> licence.<br/><br/>
|
||||||
|
<a href="https://git.autonomic.zone/3wordchant/capsul-flask/src/branch/yolocolo/capsulflask{% block pagesource %}{% endblock %}">View page source</a>
|
||||||
</footer>
|
</footer>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
@ -10,82 +10,32 @@
|
|||||||
<p>
|
<p>
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<li>
|
||||||
Which instance type should I buy?
|
What is this?
|
||||||
<p>There are no hard rules for this sort of thing, but here are some guidelines:</p>
|
<p>
|
||||||
<p>f1-xs: blog, vpn, bot, cgit</p>
|
This is a <strong>technical demo</strong> of <a
|
||||||
<p>f1-s: a bot, owncloud, gitea, popular blog</p>
|
href="https://giit.cyberia.club/~forest/capsul-flask">Capsul</a>, for the
|
||||||
<p>f1-m: docker host, build system</p>
|
as-yet-untitled <a href="https://coops.tech">Cotech</a> server hosting
|
||||||
<p>f1-l: large webservice, rotund java app</p>
|
initiative, which you can <a
|
||||||
<p>f1-x: gitlab (wow such memory very devops</p>
|
href="https://community.coops.tech/t/call-for-input-v2-co-op-vps-survey/2802/9">read
|
||||||
<p>f1-xx: something gargantuan</p>
|
about on the Cotech forum</a>.
|
||||||
|
</p>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
How do I log in?
|
What do you mean, "technical demo"?
|
||||||
<p>ssh to the ip provided to you using the cyberian user.</p>
|
<p>No backups</p>
|
||||||
<pre class='code'>$ ssh cyberian@1.2.3.4</pre>
|
<p>No service level agreement</p>
|
||||||
<p>For more information, see <a href="/about-ssh">Understanding the Secure Shell Protocol (SSH)</a>.</p>
|
<p>"Best effort" support</p>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
How do I change to the root user?
|
Where can I get this, but, more reliable?
|
||||||
<p>The cyberian user has passwordless sudo access by default. This should work:</p>
|
<p>Cyberia, the authors of this platform, run the canonical instance, <a
|
||||||
<pre class='code'>
|
href="https://capsul.org">Capsul.org</a>, on hardware they own. Please
|
||||||
# Linux
|
send them your money! (cash, crypto, or card accepted).</p>
|
||||||
$ sudo su -
|
|
||||||
|
|
||||||
# OpenBSD
|
|
||||||
$ doas su -</pre>
|
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
Do you offer reverse DNS?
|
How do I use this system?
|
||||||
<p>We do, but right now it's a manual process. Shoot us an email and we'll get it done.</p>
|
<p>Please see <a href="https://capsul.org/faq">the official Capsul FAQ
|
||||||
</li>
|
page</a>.</p>
|
||||||
<li>
|
|
||||||
What if I don't pay / don't maintain my payments?
|
|
||||||
<p>Your VM will eventually be deleted.
|
|
||||||
Capsul will send you a few inoffensive reminders as that termination date approaches.
|
|
||||||
</p>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
Besides my virtual machines and payments, what information do you keep about me?
|
|
||||||
<p>We associate an email address with every VM so that we can track payment and respond to support requests.</p>
|
|
||||||
<p>If you pay with a credit card, Stripe stores some additional details about you that we literally cannot delete.</p>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
What can I do with my VM?
|
|
||||||
<p>Make it into a mailserver, a tor relay, a VPN host, whatever you'd like - we do have one small request, though.</p>
|
|
||||||
<p>Crypto mining on capsul is currently considered obnoxious behavior, because the hashrates on our CPUs is so low and because mining crypto consumes entire processor cores that could have otherwise been shared between many dozens of other users.</p>
|
|
||||||
<p>In the future, if we have plentiful CPU resources, we may come out with a tier more suitable for mining - maybe a high cpu tier or similar, where each VM gets a full dedicated core and sharing them is not anticipated.</p>
|
|
||||||
<p>We will never snoop on your traffic or inspect what's going on inside of our customer virtual machines - we don't want to. We hope that you'll extend us a similar courtesy and try not to use too much of our shared CPU resources. Capsul is currently a shared (resource-wise) world, and we all must live in it together!</p>
|
|
||||||
<p>Also, mandatory: our systems exist within the USA, and as such those systems are bound by US law.</p>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
Can you recover my passwords/insert new keys?
|
|
||||||
<p>Can we? Technically yes. Will we? No, never. It would violate the trust that our users have in us.
|
|
||||||
We have no interest in touching client VMs after they're running.
|
|
||||||
We promise to keep your machines running smoothly.
|
|
||||||
If you lose access to your VM, that's on you.</p>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
Do you offer refunds?
|
|
||||||
<p>Not now, but email us and we can probably figure something out.</p>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
Where do the VMs run? Is it on a machine that you guys own/control?
|
|
||||||
<p>Capsul runs on a server named Baikal which Cyberia built from scratch & mailed to a datacenter
|
|
||||||
in Georgia called CyberWurx. CyberWurx staff installed it for us in a rack space that
|
|
||||||
Cyberia pays for. </p>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
Do you offer support?
|
|
||||||
<p>Yep, see <a href="/support">our support page</a>.</p>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
Do you have an SLA?
|
|
||||||
<p>No, but we normally respond pretty quickly.</p>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
Will you implement feature X?
|
|
||||||
<p>Maybe! Email <a href="mailto:ops@cyberia.club">ops@cyberia.club</a> and ask us about it.</p>
|
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</p>
|
</p>
|
||||||
|
@ -1,31 +1,26 @@
|
|||||||
{% extends 'base.html' %}
|
{% extends 'base.html' %}
|
||||||
|
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<h1>CAPSUL</h1>
|
<h1>
|
||||||
<pre>
|
<pre>
|
||||||
.-.
|
_ _
|
||||||
/:::\
|
_ _ ___ | | ___ ___ ___ | | ___
|
||||||
/::::/
|
| | | |/ _ \| |/ _ \ / __/ _ \| |/ _ \
|
||||||
/ `-:/
|
| |_| | (_) | | (_) | (_| (_) | | (_) |
|
||||||
/ /
|
\__, |\___/|_|\___/ \___\___/|_|\___/
|
||||||
\ /
|
|___/
|
||||||
`"`
|
|
||||||
</pre>
|
</pre>
|
||||||
<span>Simple, fast, private compute by <a href="https://cyberia.club">cyberia.club</a></span>
|
<span>Co-operative hosting using <a href="https://cyberia.club">Cyberia</a>'s Capsul</span>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block subcontent %}
|
{% block subcontent %}
|
||||||
<p>
|
<p>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Low friction: simply log in with your email address and fund your account with Credit/Debit or Cryptocurrency</li>
|
<li>Sign up for an account!</li>
|
||||||
<li>All root disks are backed up at no charge</li>
|
<li>Add some funds!</li>
|
||||||
<li>All storage is fast, local, and solid-state</li>
|
<li>Create a VPS!</li>
|
||||||
<li>All network connections are low latency</li>
|
<li>Give your feedback!</li>
|
||||||
<li>Supported by amazing volunteers from Cyberia</li>
|
|
||||||
<li>Upfront prices, no confusing billing</li>
|
|
||||||
<li>Operated by a Minnesota non-profit organization that will never exploit you</li>
|
|
||||||
<li>We donate a portion of our proceeds to likeminded hacker groups around the globe</li>
|
|
||||||
</ul>
|
</ul>
|
||||||
</p>
|
</p>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
@ -7,42 +7,17 @@
|
|||||||
<h1>CAPSUL TYPES & PRICING</h1>
|
<h1>CAPSUL TYPES & PRICING</h1>
|
||||||
</div>
|
</div>
|
||||||
<div class="row half-margin">
|
<div class="row half-margin">
|
||||||
<table>
|
<p>
|
||||||
<thead>
|
Rates for this service aren't set yet. You can see Cyberia's Capsul pricing
|
||||||
<tr>
|
on <a href="https://capsul.org/pricing">their website</a>.
|
||||||
<th>type</th>
|
</p>
|
||||||
<th>monthly*</th>
|
|
||||||
<th>cpus</th>
|
|
||||||
<th>mem</th>
|
|
||||||
<th>ssd</th>
|
|
||||||
<th>net</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
{% for vm_size_key, vm_size in vm_sizes.items() %}
|
|
||||||
<tr>
|
|
||||||
<td>{{ vm_size_key }}</td>
|
|
||||||
<td>${{ vm_size['dollars_per_month'] }}</td>
|
|
||||||
<td>{{ vm_size['vcpus'] }}</td>
|
|
||||||
<td>{{ vm_size['memory_mb'] }}</td>
|
|
||||||
<td>25G</td>
|
|
||||||
<td>{{ vm_size['bandwidth_gb_per_month'] }}</td>
|
|
||||||
</tr>
|
|
||||||
{% endfor %}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="row half-margin">
|
<div>
|
||||||
<pre>
|
<pre>
|
||||||
* net is calculated as a per-month average
|
SUPPORTED OPERATING SYSTEMS:
|
||||||
* vms are billed for a minimum of 24 hours upon creation
|
|
||||||
* all VMs come standard with one public IPv4 address
|
|
||||||
|
|
||||||
SUPPORTED OPERATING SYSTEMS:
|
|
||||||
|
|
||||||
|
{% for os_id, os in operating_systems.items() %} - {{ os.description }}
|
||||||
{% for os_id, os in operating_systems.items() %} - {{ os.description }}
|
{% endfor %}
|
||||||
{% endfor %}
|
</pre>
|
||||||
</pre>
|
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
@ -7,13 +7,14 @@
|
|||||||
<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:yolocolo@doesthisthing.work?subject=Please%20help!">yolocolo@doesthisthing.work</a>
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block subcontent %}
|
{% block subcontent %}
|
||||||
<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.
|
You can also find us on Matrix: <a
|
||||||
|
href="https://matrix.to/#/#untitled-hosting.public:autonomic.zone">#untitled-hosting.public:autonomic.zone</a>.
|
||||||
</p>
|
</p>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
|
94
capsulflask/theme/yolocolo/account-balance.html
Normal file
94
capsulflask/theme/yolocolo/account-balance.html
Normal file
@ -0,0 +1,94 @@
|
|||||||
|
{% extends 'base.html' %}
|
||||||
|
|
||||||
|
{% block title %}Account Balance{% endblock %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<div class="row third-margin">
|
||||||
|
<h1>Account Balance: ${{ account_balance }}</h1>
|
||||||
|
</div>
|
||||||
|
<div class="half-margin">
|
||||||
|
|
||||||
|
{% if has_vms and has_payments and warning_text != "" %}
|
||||||
|
<div class="row">
|
||||||
|
<pre class="wrap">{{ warning_text }}</pre>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
<div class="row">
|
||||||
|
{% if has_payments %}
|
||||||
|
<div>
|
||||||
|
<div class="row third-margin">
|
||||||
|
<h1>Payments</h1>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<table>
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>amount</th>
|
||||||
|
<th>date</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{% for payment in payments %}
|
||||||
|
<tr>
|
||||||
|
<td class="{{ payment['class_name'] }}">${{ payment["dollars"] }}</td>
|
||||||
|
<td class="{{ payment['class_name'] }}">{{ payment["created"] }}</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
<ul>
|
||||||
|
<li>
|
||||||
|
<h1>PAYMENT OPTIONS</h1>
|
||||||
|
<ul>
|
||||||
|
<li>
|
||||||
|
<a href="/payment/stripe">Add funds with Credit/Debit (stripe)</a>
|
||||||
|
<ul><li>notice: stripe will load nonfree javascript </li></ul>
|
||||||
|
</li>
|
||||||
|
{% if btcpay_enabled %}
|
||||||
|
<li><a href="/payment/btcpay">Add funds with Bitcoin/Litecoin/Monero (btcpay)</a></li>
|
||||||
|
{% endif %}
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
{% if has_vms %}
|
||||||
|
<div class="row third-margin">
|
||||||
|
<h1>Capsuls Billed</h1>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<table class="small">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>id</th>
|
||||||
|
<th>created</th>
|
||||||
|
<th>deleted</th>
|
||||||
|
<th>$/month</th>
|
||||||
|
<th>months</th>
|
||||||
|
<th>$ billed</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{% for vm in vms_billed %}
|
||||||
|
<tr>
|
||||||
|
<td>{{ vm["id"] }}</td>
|
||||||
|
<td>{{ vm["created"] }}</td>
|
||||||
|
<td>{{ vm["deleted"] }}</td>
|
||||||
|
<td>${{ vm["dollars_per_month"] }}</td>
|
||||||
|
<td>{{ vm["months"] }}</td>
|
||||||
|
<td>${{ vm["dollars"] }}</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block pagesource %}/templates/create-capsul.html{% endblock %}
|
60
capsulflask/theme/yolocolo/base.html
Normal file
60
capsulflask/theme/yolocolo/base.html
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<!-- Namecoin Address: N2aVL6pHtBp7EtNGb3jpsL2L2NyjBNbiB1 -->
|
||||||
|
<link href="{{ url_for('static', filename='favicon.yolocolo.ico') }}" rel="icon">
|
||||||
|
<title>{% block title %}{% endblock %}{% if self.title() %} - {% endif %}Capsul</title>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width,initial-scale=1.0">
|
||||||
|
<meta name="Description" content="Cyberia Capsul">
|
||||||
|
{% block head %}{% endblock %}
|
||||||
|
<link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}">
|
||||||
|
<link rel="stylesheet" href="{{ url_for('static', filename='style.yolocolo.css') }}">
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<nav>
|
||||||
|
<div class="row justify-space-between half-margin">
|
||||||
|
<div>
|
||||||
|
🦉 <a href="/"><b>YOLOCOLO</b></a>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
|
||||||
|
{% if session["account"] %}
|
||||||
|
{ {{ session["account"] }} <a href="{{ url_for('auth.logout') }}">Log Out</a> }
|
||||||
|
{% else %}
|
||||||
|
<a href="{{ url_for('auth.login') }}">Login</a>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row justify-center half-margin wrap nav-links">
|
||||||
|
<a href="/pricing">Pricing</a>
|
||||||
|
<a href="/faq">FAQ</a>
|
||||||
|
|
||||||
|
{% if session["account"] %}
|
||||||
|
<a href="/console">Capsuls</a>
|
||||||
|
<a href="/console/ssh">SSH Public Keys</a>
|
||||||
|
<a href="/console/account-balance">Account Balance</a>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<a href="/support">Support</a>
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
|
{% for message in get_flashed_messages() %}
|
||||||
|
<div class="flash">{{ message }}</div>
|
||||||
|
{% endfor %}
|
||||||
|
{% block custom_flash %}{% endblock %}
|
||||||
|
<main>
|
||||||
|
{% block content %}{% endblock %}
|
||||||
|
</main>
|
||||||
|
{% block subcontent %}{% endblock %}
|
||||||
|
<footer>
|
||||||
|
This server runs <a
|
||||||
|
href="https://giit.cyberia.club/~forest/capsul-flask">capsul-flask</a> by
|
||||||
|
Cyberia Computer Club, available under the <a
|
||||||
|
href="https://creativecommons.org/licenses/by-sa/4.0/">Attribution-ShareAlike
|
||||||
|
4.0 International</a> licence.<br/><br/>
|
||||||
|
<a href="https://git.autonomic.zone/3wordchant/capsul-flask/src/branch/yolocolo/capsulflask{% block pagesource %}{% endblock %}">View page source</a>
|
||||||
|
</footer>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
||||||
|
|
68
capsulflask/theme/yolocolo/capsuls.html
Normal file
68
capsulflask/theme/yolocolo/capsuls.html
Normal file
@ -0,0 +1,68 @@
|
|||||||
|
{% extends 'base.html' %}
|
||||||
|
|
||||||
|
{% block title %}Capsuls{% endblock %}
|
||||||
|
|
||||||
|
{% block custom_flash %}
|
||||||
|
{% if created %}
|
||||||
|
<div class="flash green">{{ created }} successfully created!</div>
|
||||||
|
{% endif %}
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<div class="row third-margin">
|
||||||
|
<h1>Capsuls</h1>
|
||||||
|
</div>
|
||||||
|
<div class="third-margin">
|
||||||
|
{% if has_vms %}
|
||||||
|
<div class="row third-margin justify-end">
|
||||||
|
<a href="/console/create">Create Capsul</a>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<table>
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th class="heart-icon">❦</th>
|
||||||
|
<th>id</th>
|
||||||
|
<th>size</th>
|
||||||
|
<th>cpu</th>
|
||||||
|
<th>mem</th>
|
||||||
|
<th>ipv4</th>
|
||||||
|
<th>os</th>
|
||||||
|
<th>created</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{% for vm in vms %}
|
||||||
|
<tr>
|
||||||
|
{% if vm['state'] == 'starting' or vm['state'] == 'stopping' %}
|
||||||
|
<td class="capsul-status waiting-pulse">•</td>
|
||||||
|
{% elif vm['state'] == 'crashed' or vm['state'] == 'blocked' or vm['state'] == 'stopped' %}
|
||||||
|
<td class="capsul-status red">•</td>
|
||||||
|
{% elif vm['state'] == 'unknown' %}
|
||||||
|
<td class="capsul-status-questionmark">?</td>
|
||||||
|
{% else %}
|
||||||
|
<td class="capsul-status green">•</td>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<td><a class="no-shadow" href="/console/{{ vm['id'] }}">{{ vm["id"] }}</a></td>
|
||||||
|
<td>{{ vm["size"] }}</td>
|
||||||
|
<td class="metrics"><img src="/metrics/cpu/{{ vm['id'] }}/5m/s"/></td>
|
||||||
|
<td class="metrics"><img src="/metrics/memory/{{ vm['id'] }}/5m/s"/></td>
|
||||||
|
<td class="{{ vm['ipv4_status'] }}">{{ vm["ipv4"] }}</td>
|
||||||
|
<td>{{ vm["os"] }}</td>
|
||||||
|
<td>{{ vm["created"] }}</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{% else %}
|
||||||
|
<div class="row">
|
||||||
|
<p>You don't have any Capsuls running. <a href="/console/create">Create one</a> today!</p>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block pagesource %}/templates/capsuls.html{% endblock %}
|
46
capsulflask/theme/yolocolo/faq.html
Normal file
46
capsulflask/theme/yolocolo/faq.html
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
{% extends 'base.html' %}
|
||||||
|
|
||||||
|
{% block title %}FAQ{% endblock %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<div class="row full-margin"><h1>Frequently Asked Questions</h1></div>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block subcontent %}
|
||||||
|
<p>
|
||||||
|
<ul>
|
||||||
|
<li>
|
||||||
|
What is this?
|
||||||
|
<p>
|
||||||
|
This is a <strong>technical demo</strong> of <a
|
||||||
|
href="https://giit.cyberia.club/~forest/capsul-flask">Capsul</a>, for the
|
||||||
|
as-yet-untitled <a href="https://coops.tech">Cotech</a> server hosting
|
||||||
|
initiative, which you can <a
|
||||||
|
href="https://community.coops.tech/t/call-for-input-v2-co-op-vps-survey/2802/9">read
|
||||||
|
about on the Cotech forum</a>.
|
||||||
|
</p>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
What do you mean, "technical demo"?
|
||||||
|
<p>No backups</p>
|
||||||
|
<p>No service level agreement</p>
|
||||||
|
<p>"Best effort" support</p>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
Where can I get this, but, more reliable?
|
||||||
|
<p>Cyberia, the authors of this platform, run the canonical instance, <a
|
||||||
|
href="https://capsul.org">Capsul.org</a>, on hardware they own. Please
|
||||||
|
send them your money! (cash, crypto, or card accepted).</p>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
How do I use this system?
|
||||||
|
<p>Please see <a href="https://capsul.org/faq">the official Capsul FAQ
|
||||||
|
page</a>.</p>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block pagesource %}/templates/faq.html{% endblock %}
|
||||||
|
|
28
capsulflask/theme/yolocolo/index.html
Normal file
28
capsulflask/theme/yolocolo/index.html
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
{% extends 'base.html' %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<h1>
|
||||||
|
<pre>
|
||||||
|
_ _
|
||||||
|
_ _ ___ | | ___ ___ ___ | | ___
|
||||||
|
| | | |/ _ \| |/ _ \ / __/ _ \| |/ _ \
|
||||||
|
| |_| | (_) | | (_) | (_| (_) | | (_) |
|
||||||
|
\__, |\___/|_|\___/ \___\___/|_|\___/
|
||||||
|
|___/
|
||||||
|
|
||||||
|
</pre>
|
||||||
|
<span>Co-operative hosting using <a href="https://cyberia.club">Cyberia</a>'s Capsul</span>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block subcontent %}
|
||||||
|
<p>
|
||||||
|
<ul>
|
||||||
|
<li>Sign up for an account!</li>
|
||||||
|
<li>Add some funds!</li>
|
||||||
|
<li>Create a VPS!</li>
|
||||||
|
<li>Give your feedback!</li>
|
||||||
|
</ul>
|
||||||
|
</p>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block pagesource %}/templates/index.html{% endblock %}
|
23
capsulflask/theme/yolocolo/pricing.html
Normal file
23
capsulflask/theme/yolocolo/pricing.html
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
{% extends 'base.html' %}
|
||||||
|
|
||||||
|
{% block title %}Pricing{% endblock %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<div class="row third-margin">
|
||||||
|
<h1>CAPSUL TYPES & PRICING</h1>
|
||||||
|
</div>
|
||||||
|
<div class="row half-margin">
|
||||||
|
<p>
|
||||||
|
Rates for this service aren't set yet. You can see Cyberia's Capsul pricing
|
||||||
|
on <a href="https://capsul.org/pricing">their website</a>.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<pre>
|
||||||
|
SUPPORTED OPERATING SYSTEMS:
|
||||||
|
|
||||||
|
{% for os_id, os in operating_systems.items() %} - {{ os.description }}
|
||||||
|
{% endfor %}
|
||||||
|
</pre>
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
21
capsulflask/theme/yolocolo/support.html
Normal file
21
capsulflask/theme/yolocolo/support.html
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
{% extends 'base.html' %}
|
||||||
|
|
||||||
|
{% block title %}Support{% endblock %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<div class="row half-margin">
|
||||||
|
<h1>SUPPORT</h1>
|
||||||
|
</div>
|
||||||
|
<div class="row half-margin">
|
||||||
|
<a href="mailto:yolocolo@doesthisthing.work?subject=Please%20help!">yolocolo@doesthisthing.work</a>
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block subcontent %}
|
||||||
|
<p>
|
||||||
|
You can also find us on Matrix: <a
|
||||||
|
href="https://matrix.to/#/#untitled-hosting.public:autonomic.zone">#untitled-hosting.public:autonomic.zone</a>.
|
||||||
|
</p>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block pagesource %}/templates/support.html{% endblock %}
|
36
docker-compose.yml
Normal file
36
docker-compose.yml
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
---
|
||||||
|
version: "3.8"
|
||||||
|
|
||||||
|
services:
|
||||||
|
app:
|
||||||
|
image: 3wordchant/capsul-flask:latest
|
||||||
|
build: .
|
||||||
|
volumes:
|
||||||
|
- "./:/app/code"
|
||||||
|
- "../tank:/tank"
|
||||||
|
# - "/var/run/libvirt/libvirt-sock:/var/run/libvirt/libvirt-sock"
|
||||||
|
depends_on:
|
||||||
|
- db
|
||||||
|
ports:
|
||||||
|
- "5000:5000"
|
||||||
|
environment:
|
||||||
|
- "POSTGRES_CONNECTION_PARAMETERS=host=db port=5432 user=capsul password=capsul dbname=capsul"
|
||||||
|
- SPOKE_MODEL=shell-scripts
|
||||||
|
#- FLASK_DEBUG=1
|
||||||
|
- BASE_URL=http://localhost:5000
|
||||||
|
- ADMIN_PANEL_ALLOW_EMAIL_ADDRESSES=3wc.capsul@doesthisthing.work
|
||||||
|
- VIRSH_DEFAULT_CONNECT_URI=qemu:///system
|
||||||
|
# The image uses gunicorn by default, let's override it with Flask's
|
||||||
|
# built-in development server
|
||||||
|
command: ["flask", "run", "-h", "0.0.0.0", "-p", "5000"]
|
||||||
|
db:
|
||||||
|
image: "postgres:9.6.5-alpine"
|
||||||
|
volumes:
|
||||||
|
- "postgres:/var/lib/postgresql/data"
|
||||||
|
environment:
|
||||||
|
POSTGRES_USER: capsul
|
||||||
|
POSTGRES_PASSWORD: capsul
|
||||||
|
POSTGRES_DB: capsul
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
postgres:
|
@ -48,20 +48,3 @@ $ pipenv run flask cli sql -c "SELECT id, created, email, dollars, invalidated f
|
|||||||
## how to view the logs on the database server (legion.cyberia.club)
|
## how to view the logs on the database server (legion.cyberia.club)
|
||||||
|
|
||||||
`sudo -u postgres pg_dump capsul-flask | gzip -9 > capsul-backup-2021-02-15.gz`
|
`sudo -u postgres pg_dump capsul-flask | gzip -9 > capsul-backup-2021-02-15.gz`
|
||||||
|
|
||||||
|
|
||||||
## changing the email address on an account
|
|
||||||
|
|
||||||
```
|
|
||||||
UPDATE accounts SET lower_case_email = 'new@email.address' WHERE email = 'old@email.address' ;
|
|
||||||
UPDATE accounts SET email = 'new@email.address' WHERE email = 'old@email.address' ;
|
|
||||||
UPDATE login_tokens SET email = 'new@email.address' WHERE email = 'old@email.address' ;
|
|
||||||
UPDATE operations SET email = 'new@email.address' WHERE email = 'old@email.address' ;
|
|
||||||
UPDATE payment_sessions SET email = 'new@email.address' WHERE email = 'old@email.address' ;
|
|
||||||
UPDATE payments SET email = 'new@email.address' WHERE email = 'old@email.address' ;
|
|
||||||
UPDATE ssh_public_keys SET email = 'new@email.address' WHERE email = 'old@email.address' ;
|
|
||||||
UPDATE unresolved_btcpay_invoices SET email = 'new@email.address' WHERE email = 'old@email.address' ;
|
|
||||||
UPDATE vm_ssh_authorized_key SET email = 'new@email.address' WHERE email = 'old@email.address' ;
|
|
||||||
UPDATE vm_ssh_host_key SET email = 'new@email.address' WHERE email = 'old@email.address' ;
|
|
||||||
UPDATE vms SET email = 'new@email.address' WHERE email = 'old@email.address' ;
|
|
||||||
```
|
|
||||||
|
Reference in New Issue
Block a user