update tor config for ansible2 and container1

bornhack · Oct 25, 2020 · c2879d4 · c2879d4
1 parent fc56081
commit c2879d4
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+*.swp
+
diff --git a/host_vars/ansible2.servers.bornhack.org-secrets.yml b/host_vars/ansible2.servers.bornhack.org-secrets.yml
@@ -0,0 +1,17 @@
+$ANSIBLE_VAULT;1.1;AES256
+62363662346532353061633265373838303261313834336431303663633537613261613165663231
+3734383531616365363138333238313264343432653139620a333836306336316663343630313761
+36303937666134343663666231653062353032343063343933666430646662303437313333616163
+3239313530333637640a346264323138666434323335636531386431333433393836376630386662
+64346436383832333736373734326336333062623232346138306139633134323066313530623737
+61343335643364623365633433353338653464323466306464343731616439366331306135376633
+63613930653830386232313430303163653733656561396431333263316135336636353933353365
+66333937383435313363633134613831613431616134643462333462653533373735326333303431
+61303331663235326232653038333964636366393662653033663236336338613932366138373064
+38616435333638303664303366623834613261616130313432366132363064666332326235303830
+37653435313566353364656363663833303863346130353364633239653562623431316632663462
+31393939623564646562316230646630323736323862383534386331643633623130616461373132
+63373335386562643438313130613636376264646663383633636136313236383962393664306532
+33613165306464636138663566353639326637316531643065393332623337383239636665373931
+32376131326364613037623839336339326233343036656339326331373431376334373931333538
+30366138643432613164
diff --git a/host_vars/container1.servers.bornhack.org.yml b/host_vars/container1.servers.bornhack.org.yml
@@ -17,15 +17,16 @@ node_exporter_listen_address: "127.0.0.1:9100"
 ########## tor ##############
 
 
-hiddenservices:
-  - name: "ssh"
-    hiddenserviceport: "22 127.0.0.1:22"
-    onion_hostname: "ezbbgv3dcm6hydlcedsc4funxzfbxr2alivizghtvmboouq4tym2hcyd.onion"
-    authclients:
-      - name: "ansible"
-        key: "T2MJO5F7I6EW4JNSCEZ6PSWWNO2H5BLMPJSON36ZKHTJAETLJYAQ"
-      - name: "tykling"
-        key: "SH655NXX2IDMZLDTRSJKEJPF3HZOI6P45B4NS44H7QFLHI5RQ5GA"
+tor_instances:
+  main:
+    onion_services:
+      - name: "ssh"
+        comment: "This is the primary container1 SSH onion service, it is running in fib0"
+        hidden_service_port: "22 127.0.0.1:22"
+        onion_hostname: "ezbbgv3dcm6hydlcedsc4funxzfbxr2alivizghtvmboouq4tym2hcyd.onion"
+        auth_clients:
+          - name: "ansible2"
+            pubkey: "BMED3ZZG3HDN4GPVSFYQ3LXC2WWTMU4Y6XLMN2JIZALRSYMNMN7A"
 
 
 ########## snapshots & tykbackup ###############