Update all files to use RI6F instead of RIF

GnuPG is not case-sensitive and RIF may collide with "verification" and
possibly other terms

diff --git a/README.md b/README.md
index 69782f1ee06247fc5fa9f8c38f9fade9b7540106..5cab12ac04497023f2a79844a7763b82674441f0 100644 (file)
--- a/README.md
+++ b/README.md
@@ -22,8 +22,8 @@ just connect to their computer!
 It's a bit geeky, but it works actually rather simple.
 To become a real IPv6 friend, you need to do the following things:
 
-- Generate a GPG key with a comment named **RIF** following the URL of
-  your computer (f.i. **RIF https://nico.ungleich.cloud**)
+- Generate a GPG key with a comment named **RI6F** following the URL of
+  your computer (f.i. **RI6F https://nico.ungleich.cloud**)
 - Ensure that the URL points to the IPv6 address of your computer
 - Setup a webserver on your computer
 - Export your key and all real IPv6 friend keys to your webserver as
@@ -79,9 +79,9 @@ Is this correct? (y/N) y
 GnuPG needs to construct a user ID to identify your key.
 
 Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? c
-Comment: RIF https://nico.ungleich.cloud
+Comment: RI6F https://nico.ungleich.cloud
 You selected this USER-ID:
-    "Nico Schottelius (RIF https://nico.ungleich.cloud) <ipv6@nico.ungleich.cloud>"
+    "Nico Schottelius (RI6F https://nico.ungleich.cloud) <ipv6@nico.ungleich.cloud>"
 
 Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? o
 We need to generate a lot of random bytes. It is a good idea to perform
@@ -99,7 +99,7 @@ public and secret key created and signed.
 
 pub   ed25519 2019-09-09 [SC]
       B982A8BABC030C66DEF5984527541E11E73F288D
-uid                      Nico Schottelius (RIF https://nico.ungleich.cloud) <ipv6@nico.ungleich.cloud>
+uid                      Nico Schottelius (RI6F https://nico.ungleich.cloud) <ipv6@nico.ungleich.cloud>
 sub   cv25519 2019-09-09 [E]
 
 
@@ -120,7 +120,7 @@ sudo chown $(whoami) /var/www/html
 To make yourself accessible and expose who your real IPv6 friends are.
 
 ```
-gpg -a --export RIF > /var/www/html/rifkeys
+gpg -a --export RI6F > /var/www/html/rifkeys
 ```
 
 ### Example: List your friends
@@ -128,9 +128,9 @@ gpg -a --export RIF > /var/www/html/rifkeys
 You can use the included rif-listfriends.sh or directly gpg:
 
 ```
-[1:40] line:~% gpg --list-keys --with-colons | grep RIF | awk -F: '{ print $10 }' | sed 's/\\x3a/:/'
-Nico Schottelius (RIF https://nico.ungleich.cloud) <ipv6@nico.ungleich.cloud>
-Nico Schottelius (myself) (RIF https://nico2.ungleich.cloud) <nico@nico.ungleich.cloud>
+[1:40] line:~% gpg --list-keys --with-colons | grep RI6F | awk -F: '{ print $10 }' | sed 's/\\x3a/:/'
+Nico Schottelius (RI6F https://nico.ungleich.cloud) <ipv6@nico.ungleich.cloud>
+Nico Schottelius (myself) (RI6F https://nico2.ungleich.cloud) <nico@nico.ungleich.cloud>
 ```
 
 
@@ -175,7 +175,7 @@ In any case, to update your friend list, simply repeat the command you
 ran above already in the beginning:
 
 ```
-gpg -a --export RIF > /var/www/html/rifkeys
+gpg -a --export RI6F > /var/www/html/rifkeys
 ```
 
 Or use the included `rif-exportfriends.sh`

diff --git a/rif-checkfriends.sh b/rif-checkfriends.sh
index 24bb12f04461cc3869a13c14d1f63f10de99db29..af029213cbf8caf9679b818a0069ce485db5ffc6 100755 (executable)
--- a/rif-checkfriends.sh
+++ b/rif-checkfriends.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 # 2019-09-10, Nico Schottelius, Seoul
 
-gpg --list-keys --with-colons | grep RIF | awk -F: '{ print $10 }' | sed 's/\\x3a/:/' | (
+gpg --list-keys --with-colons | grep RI6F | awk -F: '{ print $10 }' | sed 's/\\x3a/:/' | (
     while read line
     do
         name=$(echo $line | sed 's/\(.*\)(.*/\1/')
         # Assume by default offline
         online=offline
-        url=$(echo $line | sed -e 's/.*(RIF //' -e 's/).*//')
+        url=$(echo $line | sed -e 's/.*(RI6F //' -e 's/).*//')
         echo "Checking $name on $url ..."
         curl -6 -s "$url" > /dev/null && online=online
         echo $name is $online

diff --git a/rif-exportfriends.sh b/rif-exportfriends.sh
index 0014a8b1b69dbb9edbb52d2fc7aba22f9da7c3c3..20525bc854e74a4d211224cc087a7e0c5298b001 100755 (executable)
--- a/rif-exportfriends.sh
+++ b/rif-exportfriends.sh
@@ -10,7 +10,7 @@ fi
 dir=$1; shift
 keys="$dir/rifkeys"
 
-gpg -a --export RIF > "$keys"
+gpg -a --export RI6F > "$keys"
 
 # Ensure everyone can read them
 chmod 0644 "$keys"

diff --git a/rif-friendimportexport.sh b/rif-friendimportexport.sh
index a248e2fa6a9a2693ee381c6df41ee7edaeecc42c..ff41c6cecfb2d4f9ddc55ac1de42123ca927904f 100755 (executable)
--- a/rif-friendimportexport.sh
+++ b/rif-friendimportexport.sh
@@ -3,11 +3,11 @@
 
 tmp=$(mktemp)
 
-gpg --list-keys --with-colons | grep RIF | awk -F: '{ print $10 }' | sed 's/\\x3a/:/' | (
+gpg --list-keys --with-colons | grep RI6F | awk -F: '{ print $10 }' | sed 's/\\x3a/:/' | (
     while read line
     do
         name=$(echo $line | sed 's/\(.*\)(.*/\1/')
-        url=$(echo $line | sed -e 's/.*(RIF //' -e 's/).*//')
+        url=$(echo $line | sed -e 's/.*(RI6F //' -e 's/).*//')
         keyurl=$url/rifkeys
 
         echo "Getting friends from $name on $keyurl ..."

diff --git a/rif-listfriends.sh b/rif-listfriends.sh
index 4a7e31fafdb9f171ae34424e552a8aa1f91f108d..6f9af62db5314d878bc4db8167475917c0e54cbf 100755 (executable)
--- a/rif-listfriends.sh
+++ b/rif-listfriends.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 # 2019-09-10, Nico Schottelius, Seoul
 
-gpg --list-keys --with-colons | awk -F: '/RIF/ { print gensub("\\\\x3a", ":", "g", $10) }'
+gpg --list-keys --with-colons | awk -F: '/RI6F/ { print gensub("\\\\x3a", ":", "g", $10) }'