dot

packages and services management
Log | Files | Refs | README

commit 7991ee0967d22a6861d98795de17fb5375e831fc
parent 7bf19ebf3a14dc6dae7f42e4295f271f8e6ba894
Author: Josuah Demangeon <mail@josuah.net>
Date:   Mon,  9 Apr 2018 10:45:41 +0200

fix new tinc setup

Diffstat:
MMakefile | 17+++++++----------
Mgit/repos | 4++--
Mpack/tinc/build | 2+-
Mrun/tinc/hosts/t470s | 17++++++++++-------
Mrun/tinc/run | 2+-
Mrun/tinc/tinc-up | 6+++---
6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/Makefile b/Makefile @@ -3,12 +3,13 @@ all: dirs config .PHONY: dirs dirs: - mkdir -p ${HOME}/run - mkdir -p ${HOME}/var/git - mkdir -p ${HOME}/var/iso - mkdir -p ${HOME}/var/mail - mkdir -p ${HOME}/var/pub - mkdir -p ${HOME}/var/torrent + mkdir -p ${HOME}/run + mkdir -p ${HOME}/var/http + mkdir -p ${HOME}/var/git + mkdir -p ${HOME}/var/gopher + mkdir -p ${HOME}/var/torrent + mkdir -p ${HOME}/var/mail + mkdir -p ${HOME}/var/iso .PHONY: config config: @@ -29,8 +30,4 @@ config: .PHONY: git git: mkdir -p ${HOME}/var/git -<<<<<<< HEAD - grep -v ^# git/repos | (cd ${HOME}/var/git && xargs -n 1 git clone --bare) -======= (cd ${HOME}/var/git && xargs -n 1 git clone --bare) <git/repos ->>>>>>> 98903ee6ce6d16d92e67e3289c322a5c2e41edb4 diff --git a/git/repos b/git/repos @@ -12,9 +12,9 @@ git://josuah.net/ff2txt.git git://josuah.net/fungus-pathogen.git git://josuah.net/iomenu.git git://josuah.net/josuah.net.git -#git://josuah.net/mail.git +git://josuah.net/mail.git git://josuah.net/miniwi.git -#git://josuah.net/music.git +git://josuah.net/music.git git://josuah.net/ploot.git git://josuah.net/pot.git git://josuah.net/util.git diff --git a/pack/tinc/build b/pack/tinc/build @@ -4,7 +4,7 @@ --prefix="$PREFIX" \ --sbindir="$PREFIX/bin" \ --sysconfdir="$HOME/.config" \ - --localstatedir="$HOME/var" \ + --localstatedir="$HOME/run/tinc" \ --disable-lzo \ --disable-readline \ --disable-curses diff --git a/run/tinc/hosts/t470s b/run/tinc/hosts/t470s @@ -1,9 +1,12 @@ +Subnet = 172.16.55.1 + +Port = 12196 -----BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAs9niVMBFaEjcK//FqmuLhtkpWP4xNiOyA3aVpyVBDg90uRwPQyMT -dINTXXucIAoQCIeGLARj/bY7aJN3kOjEC9FA/CnVxweKsRUq4nIARHl/Pu3EMp8x -GV/MPdjMuRztA1jr7Xmlg1l3/ZSM8cmK600X1PqzRVISzlCUbD3327j20+PSUWmZ -cgL3C9zYXGkbWTrB426m72ih61Pg8PzH7smGz5j2qyyooQEaxWmBwy898E4fJD1W -LxRjHSb66l7eaZRLGAqa9clAuZA5NauUme1hJPXl+9uht2ZO1QyyR/ubM9myqbbi -RmAGus2i4w6s5BY9BNVW/ikUdk+OZd2TrQIDAQAB +MIIBCgKCAQEAzowl65KHoAl3cLPlS2Z6FeUVEu03H957rgh7M+S7k21xW1PGC/Xh +msGm5+eGKvPbr80qMJ5DMaUOPjZDE8/+n3y01ltOSeEQuwgH2Cx1vbdWsnMdFAu2 +fMa/AMRNdRRDqKKF1rajOoafgOuVR+YKoks/vfYeBWCwNn7MTRQ/Lq8Mn8E0q/Dy +mbHWU4CLlB0e6QkZ/uA2psCrDSrKQ3zM1PFvlM+uCk66oBnWKjSNoHvvfG+AYX/k +jrkivS8J0UtYMXrWYiQOZWgmxGbnOoAE5wJkMeQwPiQJ3h08l1m3yVjC62n4YUD4 +LRyRDWCSSfxB5PV9RHYgexsq65xOzj6ubQIDAQAB -----END RSA PUBLIC KEY----- -Ed25519PublicKey = On4mriKdzhjvwQ40T8YKUihBwiN+zW70CXoFbiDs4KB +Ed25519PublicKey = blA1II/aoRWKP8gzQPHWuHQH6qKHhZWIfvuZPA/9byM diff --git a/run/tinc/run b/run/tinc/run @@ -4,4 +4,4 @@ debug="4" exec 2>&1 mkdir -p run -exec tincd -D -d "$debug" --config="$PWD" --pidfile="$PWD/pid" +exec tincd -D -d "$debug" --config="$PWD" diff --git a/run/tinc/tinc-up b/run/tinc/tinc-up @@ -2,10 +2,10 @@ case "$(uname)" in (*BSD) - ifconfig "$INTERFACE" "$(tinc get subnet)" netmask 255.255.255.0 + ifconfig "${INTERFACE}" "$(tinc get subnet)" netmask 255.255.255.0 ;; (Linux) - ip link set "$INTERFACE" up - ip addr add "$(tinc get subnet | sed q)/24" dev "$INTERFACE" + ip link set "${INTERFACE}" up + ip addr add "$(tinc get subnet | sed q)/24" dev "${INTERFACE}" ;; esac