From 40cf4c6b46acff33527cec2363a952936dafcaae Mon Sep 17 00:00:00 2001
From: tv <tv@nomic.retiolum>
Date: Thu, 13 Mar 2014 18:13:56 +0100
Subject: services lib filter: initial commit

---
 services/lib/filter | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100755 services/lib/filter

(limited to 'services')

diff --git a/services/lib/filter b/services/lib/filter
new file mode 100755
index 00000000..93853895
--- /dev/null
+++ b/services/lib/filter
@@ -0,0 +1,54 @@
+#! /bin/sh
+#
+# usage:
+#   export PATH="//services/lib:$PATH"
+#   cd services
+#   ls | filter owner == $LOGNAME | filter hasnt mail
+#
+set -euf
+
+main() {
+  case $# in
+    2) op1 "$@";;
+    3) op2 "$@";;
+    *) echo 'You are made of stupid!' >&2; exit 23;;
+  esac
+}
+
+# op1 OP SCHEMA
+op1() {
+  case "$1" in
+    has)
+      xargs grep -H "^$2:" \
+        | cut -d: -f1 
+      ;;
+    hasnt)
+      a=$(mktemp)
+      b=$(mktemp)
+      trap "rm $a $b; trap - EXIT INT QUIT" EXIT INT QUIT
+      cat > $a
+      cat $a | xargs grep -H "^$2:" | cut -d: -f1 > $b
+      diff -u $b $a | sed -n '/^++/d;s/^+\(.*\)/\1/p' | grep .
+  esac
+}
+
+# op2 SCHEMA OP RHS
+op2() {
+  case "$2" in
+    ==)
+      xargs grep -H "^$1:$3$" \
+        | cut -d: -f1
+      ;;
+    !=)
+      xargs grep -H "^$1:" \
+        | grep -v ":$1:$3" \
+        | cut -d: -f1
+      ;;
+    ~=)
+      xargs grep -H "^$1:.*$3.*$" \
+        | cut -d: -f1
+      ;;
+  esac
+}
+
+main "$@"
-- 
cgit v1.2.3


From 1ba50fed30b6f8299a2582b5160f7ddb327ce2d5 Mon Sep 17 00:00:00 2001
From: tv <tv@nomic.retiolum>
Date: Thu, 13 Mar 2014 18:16:25 +0100
Subject: services lib filter: add non-op-names for binops

---
 services/lib/filter | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'services')

diff --git a/services/lib/filter b/services/lib/filter
index 93853895..f69a5b0d 100755
--- a/services/lib/filter
+++ b/services/lib/filter
@@ -35,16 +35,16 @@ op1() {
 # op2 SCHEMA OP RHS
 op2() {
   case "$2" in
-    ==)
+    ==|is)
       xargs grep -H "^$1:$3$" \
         | cut -d: -f1
       ;;
-    !=)
+    !=|isnt)
       xargs grep -H "^$1:" \
         | grep -v ":$1:$3" \
         | cut -d: -f1
       ;;
-    ~=)
+    contains)
       xargs grep -H "^$1:.*$3.*$" \
         | cut -d: -f1
       ;;
-- 
cgit v1.2.3


From a592e32c69cdacbfad1c2ac7c2b54c42155c0524 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 27 Mar 2014 13:15:13 +0100
Subject: remove legacy hosts

---
 services/bin/sync-host-to-services | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100755 services/bin/sync-host-to-services

(limited to 'services')

diff --git a/services/bin/sync-host-to-services b/services/bin/sync-host-to-services
new file mode 100755
index 00000000..ed795fb6
--- /dev/null
+++ b/services/bin/sync-host-to-services
@@ -0,0 +1,15 @@
+#!/bin/sh
+green='\e[0;32m'
+red='\e[0;31m'
+nc='\e[0m'
+
+outdir=${1?please provide services-outdir}
+find  /etc/tinc/retiolum/hosts/ -type f | while read hostfile;do
+  host=$(basename "$hostfile")
+  if test -e "$outdir/$host";then
+    echo "${green}$host already exists$nc"
+  else
+    echo "${red}$host missing, adding${nc}"
+    cat ../services.txt | sed "s#{{hostname}}#$host#" > $outdir/$host
+  fi
+done
-- 
cgit v1.2.3


From 453aa92a544c06525035105d968aa6d15445560a Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 2 Apr 2014 13:24:14 +0200
Subject: sync-host-to-services: fix colors

---
 services/bin/sync-host-to-services | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'services')

diff --git a/services/bin/sync-host-to-services b/services/bin/sync-host-to-services
index ed795fb6..526bc569 100755
--- a/services/bin/sync-host-to-services
+++ b/services/bin/sync-host-to-services
@@ -4,12 +4,12 @@ red='\e[0;31m'
 nc='\e[0m'
 
 outdir=${1?please provide services-outdir}
-find  /etc/tinc/retiolum/hosts/ -type f | while read hostfile;do
+find  ../../retiolum/hosts -type f | while read hostfile;do
   host=$(basename "$hostfile")
   if test -e "$outdir/$host";then
-    echo "${green}$host already exists$nc"
+    printf "${green}$host already exists$nc\n"
   else
-    echo "${red}$host missing, adding${nc}"
+    printf "${red}$host missing, adding${nc}\n"
     cat ../services.txt | sed "s#{{hostname}}#$host#" > $outdir/$host
   fi
 done
-- 
cgit v1.2.3


From c86af633250aa01ef993322ab39efecb73da776f Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 2 Apr 2014 13:24:41 +0200
Subject: services.txt: template without services entry (made obsolete)

---
 services/services.txt | 1 -
 1 file changed, 1 deletion(-)

(limited to 'services')

diff --git a/services/services.txt b/services/services.txt
index 265e6d1c..ad9efde6 100644
--- a/services/services.txt
+++ b/services/services.txt
@@ -3,5 +3,4 @@ type:
 mail:
 expires:
 location:
-services://{{hostname}}:22
 tinc://{{hostname}}
-- 
cgit v1.2.3


From d8b1fec7469468b0096718ec87c6e7369f871787 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 2 Apr 2014 13:26:59 +0200
Subject: add scripty to migrate old services hosts

---
 services/bin/obsolete/copy-services | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100755 services/bin/obsolete/copy-services

(limited to 'services')

diff --git a/services/bin/obsolete/copy-services b/services/bin/obsolete/copy-services
new file mode 100755
index 00000000..381d39a3
--- /dev/null
+++ b/services/bin/obsolete/copy-services
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -euf
+cd $(dirname $(readlink -f $0))
+usage(){
+    cat <<EOF 
+usage: $0 [pubkey-file] [bootstrap-file]
+    if pubkey-file is "" it will be skipped.
+
+    e.g.:
+        $0 "" ../path/to/other/bootstrap
+EOF
+    
+}
+pubfile=${1:-}
+bootfile=${2:-../etc/services/bootstrap}
+outdir=$PWD/out
+mkdir -p "$outdir"
+for i in `cat $bootfile`; do
+    # retard uriparsing but good enough for our use case
+    netloc=${i##*//}
+    host=${netloc%%:*}
+    port=${netloc##*:}
+    [ "$port" == "$host" ] && port=1337
+
+    pubarg="${pubfile:+-i $pubfile}"
+    #printf "" 
+    cat >$outdir/$host <<EOF
+$(ssh ${pubarg} "services@$host" -p "$port"  -o PasswordAuthentication=no
+    2>/dev/null||: )
+EOF
+    #printf ""
+done
+
-- 
cgit v1.2.3