Skip to content

ansible: digitalocean tweaks: #469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 13, 2023
Merged

ansible: digitalocean tweaks: #469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc21d41
ansible: digitalocean tweaks:
ikreymer Jan 13, 2023
27e0ef3
ansible: simplify domain, fix default_org
ikreymer Jan 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ansible/group_vars/do/do-values.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ crawler_limits_cpu: "2200m"
crawler_requests_memory: "1200Mi"
crawler_limits_memory: "3200Mi"

crawler_pull_policy: "Always"

# Registry
{% if use_do_registry %}
api_image: "{{ registry_endpoint }}/webrecorder/browsertrix-backend:{{ image_tag }}"
Expand Down Expand Up @@ -59,6 +61,8 @@ superuser:

registration_enabled: "{{ '1' if registration_enabled else '0' }}"

default_org: "{{ org_name }}"


# Admin Send Email Options
email:
Expand Down
6 changes: 4 additions & 2 deletions ansible/group_vars/do/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ k8s_name: "{{ project_name }}"
bucket_name: "{{ project_name }}"
bucket_path: "crawls"

domain: "{{ domain_name | default('browsertrix.cloud') }}"
domain: "browsertrix.cloud"
subdomain: "{{ project_name }}"

use_do_registry: true
Expand All @@ -27,7 +27,9 @@ signing_host: "signing"
superuser_email: "dev@webrecorder.net"
superuser_password: "PassW0rd!"

registration_enabled: true
org_name: "{{ project_name }}"

registration_enabled: false

cert_email: "{{ superuser_email }}"

Expand Down
4 changes: 3 additions & 1 deletion ansible/playbooks/do_setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,17 @@
async: 1800
poll: 60
register: db_create_result
when: db_check.stdout.find(db_name) == -1
when: "db_check.stdout.find(' ' + db_name + ' ') == -1"

- name: d_ocean | db | set db url
ansible.builtin.set_fact:
db_url: "{{ db_create_result.stdout | from_json | json_query('[0].private_connection.uri') }}"
when: "db_check.stdout.find(' ' + db_name + ' ') == -1"

- name: d_ocean | db | set db id
ansible.builtin.set_fact:
db_uuid: db_create_result.stdout | from_json | json_query('[0].id')
when: "db_check.stdout.find(' ' + db_name + ' ') == -1"

# Storage (Space)
# ===========================================
Expand Down
2 changes: 1 addition & 1 deletion backend/btrixcloud/k8s/templates/crawl_job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
containers:
- name: crawl-job
image: {{ job_image }}
imagePullPolicy: Never
imagePullPolicy: IfNotPresent
command: ["uvicorn", "btrixcloud.k8s.crawl_job:app", "--host", "0.0.0.0", "--access-log", "--log-level", "info"]

volumeMounts:
Expand Down
2 changes: 1 addition & 1 deletion backend/btrixcloud/k8s/templates/profile_job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ spec:
containers:
- name: crawl-job
image: {{ job_image }}
imagePullPolicy: Never
imagePullPolicy: IfNotPresent
command: ["python", "-m", "btrixcloud.k8s.profile_job"]

volumeMounts:
Expand Down