More generic keyserver

src/freedombone-adduser

@@ -120,8 +120,7 @@ fi
 echo "Making a GPG key for $ADD_USERNAME@$HOSTNAME"
 mkdir "/home/$ADD_USERNAME/.gnupg"
 { echo "keyserver $GPG_KEYSERVER";
-  echo 'keyserver hkp://keyserver.ubuntu.com';
-  echo 'keyserver hkp://keys.riseup.net';
+  echo 'keyserver hkps://hkps.pool.sks-keyservers.net';
   echo 'keyserver-options auto-key-retrieve';
   echo '';
   echo '# default preferences';

src/freedombone-base-email

@@ -1550,11 +1550,8 @@ function configure_gpg {
     fi
 
     sed -i "s|keyserver hkp://keys.gnupg.net|keyserver $GPG_KEYSERVER|g" "$gpg_dir/gpg.conf"
-    if ! grep -q 'keyserver.ubuntu.com' "$gpg_dir/gpg.conf"; then
-        echo 'keyserver hkp://keyserver.ubuntu.com' >> "$gpg_dir/gpg.conf"
-    fi
-    if ! grep -q 'keys.riseup.net' "$gpg_dir/gpg.conf"; then
-        echo 'keyserver hkp://keys.riseup.net' >> "$gpg_dir/gpg.conf"
+    if ! grep -q 'hkps.pool.sks-keyservers.net' "$gpg_dir/gpg.conf"; then
+        echo 'keyserver hkps://hkps.pool.sks-keyservers.net' >> "$gpg_dir/gpg.conf"
     fi
 
     gpg_agent_setup root
@@ -1689,15 +1686,8 @@ function populate_keyservers {
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
         if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
             if [ -f "/home/$USERNAME/.gnupg/gpg.conf" ]; then
-                # keyserver.ubuntu.com
-                if ! grep -q "keyserver hkp://keyserver.ubuntu.com" "/home/$USERNAME/.gnupg/gpg.conf"; then
-                    echo "keyserver hkp://keyserver.ubuntu.com" >> "/home/$USERNAME/.gnupg/gpg.conf"
-                    refresh_keys=1
-                fi
-
-                # keys.riseup.net
-                if ! grep -q "keyserver hkp://keys.riseup.net" "/home/$USERNAME/.gnupg/gpg.conf"; then
-                    echo "keyserver hkp://keys.riseup.net" >> "/home/$USERNAME/.gnupg/gpg.conf"
+                if ! grep -q "keyserver hkps://hkps.pool.sks-keyservers.net" "/home/$USERNAME/.gnupg/gpg.conf"; then
+                    echo "keyserver hkps://hkps.pool.sks-keyservers.net" >> "/home/$USERNAME/.gnupg/gpg.conf"
                     refresh_keys=1
                 fi
             fi