switch to 6785 for the local cumin port forward authored by anarcat's avatar anarcat
The rationale is that we're starting to reuse that port number
elsewhere (e.g. in fabric's reboot-fleet) and 8080 has too much
potential to be used by other things.
...@@ -43,7 +43,7 @@ Once cumin is installed drop the following configuration in ...@@ -43,7 +43,7 @@ Once cumin is installed drop the following configuration in
puppetdb: puppetdb:
host: localhost host: localhost
scheme: http scheme: http
port: 8080 port: 6785
api_version: 4 # Supported versions are v3 and v4. If not specified, v4 will be used. api_version: 4 # Supported versions are v3 and v4. If not specified, v4 will be used.
clustershell: clustershell:
ssh_options: ssh_options:
...@@ -58,7 +58,7 @@ Now you can simply use an alias like the following: ...@@ -58,7 +58,7 @@ Now you can simply use an alias like the following:
while making sure that you setup an ssh tunnel manually before calling cumin while making sure that you setup an ssh tunnel manually before calling cumin
like the following: like the following:
ssh -L8080:localhost:8080 puppetdb-01.torproject.org ssh -L6785:localhost:8080 puppetdb-01.torproject.org
Or instead of the alias and the ssh command, you can try setting up an Or instead of the alias and the ssh command, you can try setting up an
automatic tunnel upon calling `cumin`. See the following section to set that automatic tunnel upon calling `cumin`. See the following section to set that
...@@ -105,7 +105,7 @@ Description=Socket activation for PuppetDB tunnel ...@@ -105,7 +105,7 @@ Description=Socket activation for PuppetDB tunnel
After=network.target After=network.target
[Socket] [Socket]
ListenStream=127.0.0.1:8080 ListenStream=127.0.0.1:6785
Accept=yes Accept=yes
[Install] [Install]
...@@ -126,7 +126,7 @@ removed. ...@@ -126,7 +126,7 @@ removed.
The above can be tested by hand without creating any systemd The above can be tested by hand without creating any systemd
configuration with: configuration with:
systemd-socket-activate -a --inetd -E SSH_AUTH_SOCK=/run/user/1000/gnupg/S.gpg-agent.ssh -l 127.0.0.1:8080 \ systemd-socket-activate -a --inetd -E SSH_AUTH_SOCK=/run/user/1000/gnupg/S.gpg-agent.ssh -l 127.0.0.1:6785 \
ssh -o BatchMode=yes -W localhost:8080 puppetdb-01.torproject.org ssh -o BatchMode=yes -W localhost:8080 puppetdb-01.torproject.org
The tunnel will be shutdown as soon as it's done, and fired up as The tunnel will be shutdown as soon as it's done, and fired up as
...@@ -145,7 +145,7 @@ Description=Setup port forward to puppetdb ...@@ -145,7 +145,7 @@ Description=Setup port forward to puppetdb
After=network.target After=network.target
[Service] [Service]
ExecStart=/usr/bin/ssh -nNT -o ExitOnForwardFailure=yes -o BatchMode=yes -L 8080:localhost:8080 puppetdb-01.torproject.org ExecStart=/usr/bin/ssh -nNT -o ExitOnForwardFailure=yes -o BatchMode=yes -L 6785:localhost:8080 puppetdb-01.torproject.org
Environment=SSH_AUTH_SOCK=/run/user/1003/gnupg/S.gpg-agent.ssh Environment=SSH_AUTH_SOCK=/run/user/1003/gnupg/S.gpg-agent.ssh
``` ```
... ...
......