Skip to content

Commit e424526

Browse files
dcadenasdcadenas
committed
Merge branch 'main' into unhardcode_relay_secret
2 parents 37c031c + 864548b commit e424526

File tree

34 files changed

+1815
-77
lines changed

34 files changed

+1815
-77
lines changed

‎README.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ published here in case they are useful for other scuttlebutt/nostr users.
1010
1. Install Ansible and Ansible Galaxy
1111
2. Run `ansible-galaxy install -r requirements.yml`
1212

13+
# Running ansible against Droplets created under the `terraform` repository
14+
All new droplets created using the [terraform repo](https://github.com/verse-pbc/terraform) will begin with only `DEFAULT_DROPLET_ROOT_SSH_KEY`, which is
15+
securely stored in DigitalOcean. Individual admin users are created on a Droplet, and have their SSH keys added, through
16+
the [ssh-config-and-harden](./roles/ssh-config-and-harden) role. In the next few week, this playbook will be automatically
17+
executed against new Droplets upon creation, so user SSH access for running Ansible scripts against new Droplets will
18+
be available for those configured during Droplet-creation. In the short-term, though, you can message Ben, and he can
19+
execute the `ssh-config-and-harden` role against the new Droplet to grant access.
20+
1321
# Repo structure
1422

1523
Ansible is structured around running playbooks against an inventory of servers. Our repo is mainly structured, around our

new-server-vars.yml renamed to deprecated/new-server-vars.yml

File renamed without changes.

playbooks/new-do-droplet.yml renamed to deprecated/playbooks/new-do-droplet.yml

File renamed without changes.

roles/new-do-droplet/README.md renamed to deprecated/roles/new-do-droplet/README.md

File renamed without changes.

roles/new-do-droplet/defaults/main.yml renamed to deprecated/roles/new-do-droplet/defaults/main.yml

File renamed without changes.

roles/new-do-droplet/tasks/main.yml renamed to deprecated/roles/new-do-droplet/tasks/main.yml

File renamed without changes.

roles/new-do-droplet/templates/cloud-config.yml.tpl renamed to deprecated/roles/new-do-droplet/templates/cloud-config.yml.tpl

File renamed without changes.

‎inventories/followers_server/group_vars/all/vault.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
$ANSIBLE_VAULT;1.1;AES256
2-
34343963653734633631653433363330613161643164623038663463303464326461663261623732
3-
3632366436363931623736663337343063633739303036640a383938633231636463316533383633
4-
62636632333463353132336262396438343438393364636339313633346466653964636430313530
5-
3832303366636665620a323762663830346464393734303066363038303336663563393431333664
6-
34653066666533366130336462316535366434346135666431316561333037313833656532663533
7-
31616466373962313564323563623763316333633164623661313734393334643435323066653464
8-
65313165343031623763626465386163613838383133386233376563363064656363393764393164
9-
33346564363864653933313934633239636266333938316463353064386330613038386362613830
10-
30383631363932623237333832636137353634366363626562343964623666356537383762633535
11-
35313231343934313036373461653230656361663931653935356561323631653833373261333163
12-
62343665373861333337316232643366386331323339626430316466353237386538303438656464
13-
64303030343636356630633034396538623435656435353765373836623738356262643264343031
14-
3134
2+
31363030313061623966386534373563343763376338613033373434336636343236386663366566
3+
6462636239303565383739376439366331636432396233350a613737366235626337663132316264
4+
65663739343133323033303464313066323635383062303138663934353738626563363539656339
5+
6531333337346237320a333239616534616430383166646539333062393832666639393533623139
6+
37383934316362663436376632323832346563393939353835323031363464316137396163376430
7+
37663166333665393364353330303035633937383832303135366631303464356663636438656436
8+
34616537376362306135326564623265323663663431346263356633613064396464663965633164
9+
64656439396330383434376266333765303461623965356431333338333465396337333630383235
10+
33313565636332306630663733343565363565366137613362356639386236626433373330303536
11+
64383661623135613838316164616430313365613932316338343936336630613431366530373338
12+
30313133326330326337373662323133303238386264383439613335386531303631343561373134
13+
31383966343832386231383263356632393633646164373736656230623434393864643138363932
14+
3635

‎inventories/loki-alloy/group_vars/all/vault.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
$ANSIBLE_VAULT;1.1;AES256
2+
31313536656632373238623439393462623131326438396462636634653166666333313139313065
3+
6336653834636637373166376339653131343262313431350a643936663464613862343134373530
4+
31326237356132386363386265366636653431303061326466633833353833383662393062313031
5+
6363663162643165320a353264646664363665323334306361356564393665373837646630613035
6+
61646537653638303736623831326164663831623361616632373137383539653961303435353465
7+
30613137356163633230383665323535343763666338393030396366323463366261633863643663
8+
37343965366562396263303166386334343830623065333339323565363036373661383630633036
9+
38313966353033343364

‎inventories/loki-alloy/inventory.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
all:
2+
vars:
3+
loki_password_hashed_escaped: "{{ loki_password_hashed_escaped }}"
4+
hosts:
5+
relay.nos.social:
6+
ansible_user: admin
7+
loki.planetary.tools:
8+
ansible_user: root

0 commit comments

Comments
 (0)