Merge pull request 'add i2pd p2p' (#4) from qvqc/ansible-remote-node:master into master

Reviewed-on: dsc/ansible-remote-node#4

roles/wownerod/defaults/main.yaml

@@ -6,4 +6,5 @@ wownero_bin_dir: "/usr/local/bin"
 wownerod_path: "{{ wownero_bin_dir }}/wownerod"
 wownerod_p2p_port: "34567"
 wownerod_rpc_port: "34568"
-wownerod_p2p_tor_port: "34566"
+wownerod_p2p_tor_port: "34566"
+wownerod_p2p_i2p_port: "34565"

roles/wownerod/tasks/main.yaml

@@ -90,6 +90,17 @@
 - name: Pause 1 minute for b32.i2p creation
   pause:
     minutes: 1
+
+- name: get i2p p2p
+  shell: curl http://127.0.0.1:7070/?page=i2p_tunnels 2>&1 | grep -Eo "[a-zA-Z0-9./?=_%:-]*" | grep "34565"
+  register: i2pinsert
+- name: add i2p inbound wownerod.conf
+  lineinfile:
+    dest: /etc/wownerod.conf
+    line: "anonymous-inbound={{ i2pinsert.stdout }},127.0.0.1:{{ wownerod_p2p_i2p_port }},64"
+  notify:
+    - restart wownerod
+
 - name: get onion hostname
   slurp:
     src: /var/lib/tor/wownero/hostname
@@ -105,16 +116,16 @@
     - restart wownerod
 - name: Flush handlers
   meta: flush_handlers
-- name: get i2p hostname
-  find:
-    path: /var/lib/i2pd/destinations
+- name: get i2p rpc hostname
+  shell: curl http://127.0.0.1:7070/?page=i2p_tunnels 2>&1 | grep -Eo "[a-zA-Z0-9./?=_%:-]*" | grep "34568"
   register: i2phost
 - name: show b32 i2p and onion
   debug:
     msg:
-      - "ADD URLs TO https://MONERO.FAIL/?crypto=wownero"
-      - "YOUR I2P ADDRESS (remove .dat, add .b32.i2p):"
-      - "{{ item.path | basename }}"
-      - "YOUR TOR ADDRESS:"
+      - "ADD RPC URLs TO https://MONERO.FAIL/?crypto=wownero"
+      - "YOUR I2P P2P ADDRESS :"
+      - "{{ i2pinsert.stdout }}"
+      - "YOUR I2P RPC ADDRESS :"
+      - "{{ i2phost.stdout }}"
+      - "YOUR TOR P2P/RPC ADDRESS:"
       - "{{ onionhost['content'] | b64decode }}"
-  with_items: "{{ i2phost.files }}"

roles/wownerod/templates/tunnels.conf.j2

@@ -1,5 +1,10 @@
-[wownero]
+[wownero-rpc]
 type = http
 host = 127.0.0.1
 port = {{ wownerod_rpc_port }}
-keys = wownero.dat
+keys = wownero-rpc.dat
+[wownero-p2p]
+type = server
+host = 127.0.0.1
+port = {{ wownerod_p2p_i2p_port }}
+keys = wownero-p2p.dat