summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--Makefile114
-rw-r--r--README.md65
-rwxr-xr-xbin/meta-check41
-rwxr-xr-xbin/meta-normalize-stdio171
-rwxr-xr-xbin/pgp-get-keyid-by-uid5
-rwxr-xr-xbin/pgp-list-keyids28
-rwxr-xr-xbin/postfix-generate-virtual-map21
-rwxr-xr-xbin/ssh-list-authorized-keys30
-rwxr-xr-xbin/uid-map10
-rw-r--r--dev-imgs/aurelien.pngbin5670 -> 0 bytes
-rw-r--r--dev-imgs/coadde.pngbin28477 -> 0 bytes
-rw-r--r--dev-imgs/emulatorman.pngbin26329 -> 0 bytes
-rw-r--r--dev-imgs/fauno.pngbin2220 -> 0 bytes
-rw-r--r--dev-imgs/gaming4jc.pngbin28100 -> 0 bytes
-rw-r--r--dev-imgs/lukeshu.pngbin28040 -> 0 bytes
-rw-r--r--dev-imgs/mstreet.pngbin24810 -> 0 bytes
-rw-r--r--dev-imgs/ovruni.pngbin32737 -> 0 bytes
-rw-r--r--dev-imgs/shackra.pngbin29085 -> 0 bytes
-rw-r--r--dev-imgs/sorin-mihai.pngbin16884 -> 0 bytes
-rw-r--r--dev-imgs/zenhack.pngbin25206 -> 0 bytes
-rwxr-xr-xgit-shell-commands/change-description (renamed from misc/git-shell-commands/change-description)0
-rwxr-xr-xgit-shell-commands/change-owner (renamed from misc/git-shell-commands/change-owner)0
-rwxr-xr-xgit-shell-commands/create-bare-repo (renamed from misc/git-shell-commands/create-bare-repo)0
-rwxr-xr-xgit-shell-commands/delete-repo (renamed from misc/git-shell-commands/delete-repo)0
-rwxr-xr-xgit-shell-commands/fetch-mirrors (renamed from misc/git-shell-commands/fetch-mirrors)0
-rwxr-xr-xgit-shell-commands/help (renamed from misc/git-shell-commands/help)0
-rwxr-xr-xgit-shell-commands/hook-install (renamed from misc/git-shell-commands/hook-install)0
-rwxr-xr-xgit-shell-commands/mirror (renamed from misc/git-shell-commands/mirror)0
-rwxr-xr-xgit-shell-commands/mirrors (renamed from misc/git-shell-commands/mirrors)0
-rw-r--r--gpg-init.txt10
-rwxr-xr-xmisc/git-hooks/auto-deploy16
-rwxr-xr-xmisc/git-hooks/generic12
-rwxr-xr-xmisc/git-hooks/hackers-update22
-rw-r--r--users/1000.yml21
-rw-r--r--users/1001.yml10
-rw-r--r--users/1002.yml7
-rw-r--r--users/1003.yml21
-rw-r--r--users/1004.yml7
-rw-r--r--users/1005.yml23
-rw-r--r--users/1006.yml7
-rw-r--r--users/1007.yml22
-rw-r--r--users/1008.yml22
-rw-r--r--users/1009.yml26
-rw-r--r--users/1010.yml9
-rw-r--r--users/1011.yml22
-rw-r--r--users/1012.yml17
-rw-r--r--users/1013.yml21
-rw-r--r--users/1014.yml7
-rw-r--r--users/1015.yml24
-rw-r--r--users/1016.yml19
-rw-r--r--users/1017.yml20
-rw-r--r--users/1018.yml22
-rw-r--r--users/1019.yml17
-rw-r--r--users/1020.yml24
-rw-r--r--users/1021.yml21
-rw-r--r--users/1022.yml20
-rw-r--r--users/1023.yml22
-rw-r--r--users/1024.yml19
-rw-r--r--users/1025.yml7
-rw-r--r--users/1026.yml18
-rw-r--r--users/1027.yml17
-rw-r--r--users/1028.yml20
-rw-r--r--users/1029.yml21
-rw-r--r--users/1030.yml19
-rw-r--r--users/1031.yml20
-rw-r--r--users/1100.yml11
67 files changed, 0 insertions, 1130 deletions
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index cdd1e01..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*~
-/output
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 4c69241..0000000
--- a/Makefile
+++ /dev/null
@@ -1,114 +0,0 @@
-V=20150529
-
-export LANG=C
-export SHELL=/bin/bash
-
-KEYSERVER = hkp://pool.sks-keyservers.net
-KEYRING_NAME = parabola
-
-GPG = gpg --quiet --batch --no-tty --no-permission-warning --keyserver ${KEYSERVER} --homedir output/cache/pacman-keyring/gpghome
-MKDIRS = mkdir -p
-FAIL = exit 1
-
-dep_dir = $1 $(shell find $1)
-users = $(call dep_dir,users)
-
-all: PHONY pacman-keyring postfix-virtual-map
-
-PREFIX = /usr/local
-
-install:
- install -dm755 $(DESTDIR)$(PREFIX)/share/pacman/keyrings/
- install -m0644 parabola{.gpg,-trusted,-revoked} $(DESTDIR)$(PREFIX)/share/pacman/keyrings/
-
-uninstall:
- rm -f $(DESTDIR)$(PREFIX)/share/pacman/keyrings/parabola{.gpg,-trusted,-revoked}
- rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/share/pacman/keyrings/
-
-dist:
- cp -rv output/pacman-keyring output/parabola-keyring-$(V)/
- cp -v Makefile output/parabola-keyring-$(V)/
- bsdtar czf output/parabola-keyring-$(V).tar.gz -C output parabola-keyring-$(V)/
- gpg --detach-sign --use-agent output/parabola-keyring-$(V).tar.gz
-
-upload:
- scp output/parabola-keyring-$(V).tar.gz output/parabola-keyring-$(V).tar.gz.sig parabola:/srv/repo/main/other/parabola-keyring
-
-clean: PHONY
- rm -rf output/cache
-
-distclean: PHONY
- rm -rf output
-
-####
-
-postfix-virtual-map: PHONY output/postfix-virtual-map/virtual-parabola.nu
-
-output/postfix-virtual-map/virtual-parabola.nu: ${users}
- ${MKDIRS} ${@D}
- bin/postfix-generate-virtual-map > $@
-
-####
-
-pacman-keyring: PHONY \
- output/pacman-keyring/${KEYRING_NAME}.gpg \
- output/pacman-keyring/${KEYRING_NAME}-trusted \
- output/pacman-keyring/${KEYRING_NAME}-revoked
-
-# Assemble the list of .asc files needed to generate the keyring
-output/cache/pacman-keyring/deps.mk: ${users}
- $(MKDIRS) ${@D}
- { \
- echo output/pacman-keyring/${KEYRING_NAME}.gpg: $$(bin/pgp-list-keyids | sed -r 's|(\S+) .*|output/cache/pacman-keyring/keys/\1.asc|') && \
- echo output/cache/pacman-keyring/stamp.ownertrust: $$(bin/pgp-list-keyids | sed -rn 's|^(trusted/\S+) .*|output/cache/pacman-keyring/keys/\1.asc|p') && \
- bin/uid-map | sed 's|.*|trusted:&\nsecondary:&\nrevoked:&|' | sed -r 's|(.*):(.*):(.*)|output/cache/pacman-keyring/keys/\1/\3.asc: users/\2.yml|' && \
- :; }> $@
--include output/cache/pacman-keyring/deps.mk
-
-output/cache/pacman-keyring/stamp.gpg-init: gpg-init.txt
- ${MKDIRS} ${@D} output/cache/pacman-keyring/gpghome
- ${GPG} --gen-key < $<
- touch $@
-output/cache/pacman-keyring/stamp.ownertrust: output/pacman-keyring/${KEYRING_NAME}-trusted output/cache/pacman-keyring/deps.mk
- ${MKDIRS} ${@D}
- ${GPG} --import-ownertrust < $< 2>/dev/null
- touch $@
-
-output/pacman-keyring/${KEYRING_NAME}.gpg: output/cache/pacman-keyring/deps.mk
- $(MKDIRS) ${@D}
- cat $(filter %.asc,$^) > $@
-output/pacman-keyring/${KEYRING_NAME}-trusted: ${users}
- $(MKDIRS) ${@D}
- bin/pgp-list-keyids | sed -rn 's|^trusted/\S+ (\S+)|\1:4:|p' > $@
-output/pacman-keyring/${KEYRING_NAME}-revoked: ${users}
- $(MKDIRS) ${@D}
- bin/pgp-list-keyids | sed -rn 's|^revoked/\S+ ||p' > $@
-
-# These 3 rules are mostly straight from "archlinux-keyring.git/update-keys"
-# The appropriate .yml file is added as a dependency by deps.mk
-keyid=$$(bin/pgp-get-keyid-by-uid $(patsubst users/%.yml,%,$(filter %.yml,$^)))
-output/cache/pacman-keyring/keys/trusted/%.asc: output/cache/pacman-keyring/stamp.gpg-init
- ${MKDIRS} ${@D}
- ${GPG} --recv-keys ${keyid} &>/dev/null
- printf 'minimize\nquit\ny\n' | ${GPG} --command-fd 0 --edit-key ${keyid}
- #${GPG} --yes --lsign-key ${keyid} &>/dev/null
- printf 'y\ny\n' | ${GPG} --command-fd 0 --lsign-key ${keyid} &>/dev/null
- ${GPG} --armor --no-emit-version --export ${keyid} > $@
-output/cache/pacman-keyring/keys/secondary/%.asc: output/cache/pacman-keyring/stamp.ownertrust
- ${MKDIRS} ${@D}
- ${GPG} --recv-keys ${keyid} &>/dev/null
- printf 'clean\nquit\ny\n' | ${GPG} --command-fd 0 --edit-key ${keyid}
- ${GPG} --list-keys --with-colons ${keyid} 2>/dev/null | grep -q '^pub:f:' # make sure it is trusted
- ${GPG} --armor --no-emit-version --export ${keyid} > $@
-output/cache/pacman-keyring/keys/revoked/%.asc: output/cache/pacman-keyring/stamp.ownertrust
- ${MKDIRS} ${@D}
- ${GPG} --recv-keys ${keyid} &>/dev/null
- printf 'clean\nquit\ny\n' | ${GPG} --command-fd 0 --edit-key ${keyid}
- ! ${GPG} --list-keys --with-colons ${keyid} 2>/dev/null | grep -q '^pub:f:' # make sure it's not trusted
- ${GPG} --armor --no-emit-version --export ${keyid} > $@
-
-####
-
-.PHONY: PHONY
-.SECONDARY:
-.DELETE_ON_ERROR:
diff --git a/README.md b/README.md
deleted file mode 100644
index 58e3bc0..0000000
--- a/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
-This repository contains 4 things:
-
- 1. Information about Parabola contributors
- 2. `Makefile` and `bin/`: tools for working with that information
- 3. `misc/git-shell-commands`: for use with git-shell
- 4. `misc/git-hooks`: git hooks
-
-Honestly, the latter two probably don't belong, but they've always
-been in this repository, so I didn't want to just delete them. If you
-remove git-shell-hooks in the future, be warned that
-/srv/git/git-shell-commands is currently a symlink to there; you'll
-want to change that.
-
-Adding users
-============
-
-Users ("hackers") are added by creating a file in the `users/`
-directory. The file should be named `users/${UID}.yml` where UID is
-the numeric POSIX user ID for that user. See
-`bin/meta-normalize-stdio` for a listing of all the properties you can
-put in the users file; or look at the existing files as examples.
-
-To add a profile image of a user, add it to the `dev-imgs/` folder.
-
-Images in `dev-imgs/`:
- - MUST be named `${username}.png`
- - SHOULD be 125x125 px
- - SHOULD be run through pngcrush
-
-The files in `bin/` are configured with `cfg_*` variables at the top
-of each file.
-
-Using the tools (make)
-======================
-
-There are 4 `make` targets of interest: `pacman-keyring`, `dist`,
-`upload` and `postfix-virtual-map`. `make [all]` makes `pacman-keyring`
-and`postfix-virtual-map`. The output goes in
-`output/{pacman-keyring,postfix-virtual-map}` respectively.
-
-`pacman-keyring` makes the Pacman keyring that we package up as the
-`parabola-keyring` package.
-
-`dist` makes the `parabola-keyring` tarball.
-
-`upload` makes the uploading of `parabola-keyring` tarball to the server.
-
-`postfix-virtual-map` makes a map for postfix email aliases we provide
-to our developers.
-
-Using the tools (scripts)
-=========================
-
-Most of the scripts assume that the current directory is the root of
-this repository.
-
-The most important 3 scripts are:
-
- - `meta-check`: sanity-check the user data
- - `meta-normalize-stdio`: normalize a user YAML file
- - `ssh-list-authorized-keys`: configure sshd to use this for
- AuthorizedKeysCommand to have it get SSH keys directly from the
- user data here
-
-The others are all used by `make`.
diff --git a/bin/meta-check b/bin/meta-check
deleted file mode 100755
index 16994ce..0000000
--- a/bin/meta-check
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-. libremessages
-
-PATH="$(dirname "$0"):$PATH"
-
-check-yaml() {
- file=$1
- msg 'Inspecting %q' "$file"
- norm=$(mktemp --tmpdir)
- trap "rm -f -- $(printf '%q' "$norm")" RETURN
- meta-normalize-stdio < "$file" > "$norm" || return $?
- colordiff -u "$file" "$norm" || return $?
-}
-
-main() {
- declare -i ret=0
-
- # Check the user YAML files
- for file in users/*.yml; do
- check-yaml "$file" || ret=$?
- done
-
- msg 'Checking for duplicate usernames'
- dups=($(sed -n 's/^username: //p' -- users/*.yml| sort | uniq -d))
- if (( ${#dups[@]} )); then
- error 'Duplicate usernames:'
- plain '%s' "${dups[@]}"
- ret=1
- fi
-
- msg 'Checking PGP keys'
- if pgp-list-keyids | grep -Ev '^(trusted|secondary|revoked)/[a-z][a-z0-9-]* [0-9A-F]{40}$'; then
- error 'Bad pgp keys ^^^'
- ret=1
- fi
-
- return $ret
-}
-
-main "$@"
diff --git a/bin/meta-normalize-stdio b/bin/meta-normalize-stdio
deleted file mode 100755
index 5611ae6..0000000
--- a/bin/meta-normalize-stdio
+++ /dev/null
@@ -1,171 +0,0 @@
-#!/usr/bin/env ruby
-
-# First we define a bunch of code-generators, then at the end is a
-# very neat and readable definition of the format of the YAML files.
-
-require 'yaml'
-
-def error(msg)
- $stderr.puts "ERROR: #{msg}"
- @err = 1
-end
-
-def warning(msg)
- $stderr.puts "WARNING: #{msg}"
-end
-
-
-# Generic validators/formatters
-
-def semiordered_list(cnt, validator)
- lambda {|name,ary|
- if ary.class != Array
- error "`#{name}' must be a list"
- else
- ary.each_index{|i| ary[i] = validator.call("#{name}[#{i}]", ary[i])}
- ary = ary.first(cnt).concat(ary.last(ary.count-cnt).sort)
- end
- ary
- }
-end
-
-def unordered_list(validator)
- semiordered_list(0, validator)
-end
-
-def _unknown(map_name, key)
- error "Unknown item: #{map_name}[#{key.inspect}]"
- 0
-end
-def unordered_map1(validator)
- lambda {|name,hash|
- if hash.class != Hash
- error "`#{name}' must be a map"
- else
- order = Hash[[*validator.keys.map.with_index]]
- hash = Hash[hash.sort_by{|k,v| order[k] || _unknown(name,k) }]
- hash.keys.each{|k|
- if validator[k]
- hash[k] = validator[k].call("#{name}[#{k.inspect}]", hash[k])
- end
- }
- end
- hash
- }
-end
-
-def unordered_map2(key_validator, val_validator)
- lambda {|name,hash|
- if hash.class != Hash
- error "`#{name}' must be a map"
- else
- hash = Hash[hash.sort_by{|k,v| k}]
- hash.keys.each{|k|
- key_validator.call("#{name} key #{k.inspect}", k)
- hash[k] = val_validator.call("#{name}[#{k.inspect}]", hash[k])
- }
- end
- hash
- }
-end
-
-string = lambda {|name,str|
- if str.class != String
- error "`#{name}' must be a string"
- else
- str
- end
-}
-
-# Regular Expression String
-def restring(re)
- lambda {|name,str|
- if str.class != String
- error "`#{name}' must be a string"
- else
- unless re =~ str
- error "`#{name}' does not match #{re.inspect}: #{str}"
- end
- str
- end
- }
-end
-
-
-# Specific validators/formatters
-
-year = lambda {|name, num|
- if num.class != Fixnum
- error "`#{name}' must be a year"
- else
- if (num < 1900 || num > 3000)
- error "`#{name}' is a number, but doesn't look like a year"
- end
- num
- end
-}
-
-# This regex is taken from http://www.w3.org/TR/html5/forms.html#valid-e-mail-address
-_email_regex = /^[a-zA-Z0-9.!\#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/
-email_list = lambda {|name, ary|
- if ary.class != Array
- error "`#{name}' must be a list"
- elsif not ary.empty?
- preserve = 1
- if ary.first.end_with?("@parabola.nu") and ary.count >= 2
- preserve = 2
- end
- ary = semiordered_list(preserve, restring(_email_regex)).call(name, ary)
- end
- ary
-}
-
-shell = lambda {|name, sh|
- if sh.class != String
- error "`#{name}' must be a string"
- else
- @valid_shells ||= open("/etc/shells").read.split("\n")
- .find_all{|line| /^[^\#]/ =~ line}
- unless @valid_shells.include?(sh)
- warning "shell not listed in /etc/shells: #{sh}"
- end
- end
- sh
-}
-
-
-# The format of the YAML files
-
-format = unordered_map1(
- {
- "username" => restring(/^[a-z][a-z0-9-]*$/),
- "fullname" => string,
- "email" => email_list,
- "groups" => semiordered_list(1, string),
- "pgp_keyid" => restring(/^[0-9A-F]{40}$/),
- "pgp_revoked_keyids" => unordered_list(restring(/^[0-9A-F]{40}$/)),
- "ssh_keys" => unordered_map2(string, string),
- "shell" => shell,
- "extra" => unordered_map1(
- {
- "alias" => string,
- "other_contact" => string,
- "roles" => string,
- "website" => string,
- "occupation" => string,
- "yob" => year,
- "location" => string,
- "languages" => string,
- "interests" => string,
- "favorite_distros" => string,
- })
- })
-
-
-
-@err = 0
-user = format.call("user", YAML::load(STDIN))
-if @err != 0
- exit @err
-end
-print user.to_yaml
diff --git a/bin/pgp-get-keyid-by-uid b/bin/pgp-get-keyid-by-uid
deleted file mode 100755
index 1dea99f..0000000
--- a/bin/pgp-get-keyid-by-uid
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-# Usage: pgp-get-keyid-by-uid {uid}
-
-require 'yaml'
-puts YAML::load(open("users/#{ARGV[0]}.yml"))["pgp_keyid"]
diff --git a/bin/pgp-list-keyids b/bin/pgp-list-keyids
deleted file mode 100755
index 93bc292..0000000
--- a/bin/pgp-list-keyids
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env ruby
-# Usage: pgp-list-keyids
-cfg_groups = {
- :trusted => [ "hackers", "bots" ],
- :secondary => [ "trustedusers" ]
-}
-
-######################################################################
-require 'yaml'
-
-users = Dir.glob("users/*.yml").map{|f|YAML::load(open(f))}
-
-users.each do |user|
- if user["groups"]
- if ! (user["groups"] & cfg_groups[:trusted]).empty?
- puts "trusted/#{user["username"]} #{user["pgp_keyid"]}"
- elsif ! (user["groups"] & cfg_groups[:secondary]).empty?
- puts "secondary/#{user["username"]} #{user["pgp_keyid"]}"
- elsif user["pgp_keyid"]
- puts "revoked/#{user["username"]} #{user["pgp_keyid"]}"
- end
- end
- if user["pgp_revoked_keyids"]
- user["pgp_revoked_keyids"].each do |keyid|
- puts "revoked/#{user["username"]} #{keyid}"
- end
- end
-end
diff --git a/bin/postfix-generate-virtual-map b/bin/postfix-generate-virtual-map
deleted file mode 100755
index 1203c63..0000000
--- a/bin/postfix-generate-virtual-map
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby
-# Usage: postfix-show-virtual-map > ${file} && postmap hash:${file}
-cfg_groups = [ "hackers", "fellows" ]
-
-######################################################################
-require 'yaml'
-
-users = Dir.glob("users/*.yml").map{|f|YAML::load(open(f))}
- .find_all{|u|u["groups"] and not (u["groups"] & cfg_groups).empty?}
-
-users.each do |user|
- if user["email"] and user["email"].length > 0
- if user["email"][0] =~ /.*@parabola.nu$/
- if user["email"].length > 1
- puts "#{user["username"]}@parabola.nu #{user["email"][1]}"
- end
- else
- puts "#{user["username"]}@parabola.nu #{user["email"][0]}"
- end
- end
-end
diff --git a/bin/ssh-list-authorized-keys b/bin/ssh-list-authorized-keys
deleted file mode 100755
index 6a03c8d..0000000
--- a/bin/ssh-list-authorized-keys
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env ruby
-# Usage: ssh-list-authorized-keys [username]
-cfg_groups = [ "repo", "git" ]
-
-######################################################################
-require 'set'
-require 'yaml'
-
-all_users = Dir.glob("users/*.yml").map{|f|YAML::load(open(f))}
-users = Set.new
-
-groupnames = ARGV & cfg_groups
-usernames = ARGV & all_users.map{|u|u["username"]}
-
-unless groupnames.empty?
- groupnames.push("hackers")
-end
-
-users = all_users.find_all{|u| usernames.include?(u["username"]) or not ((u["groups"]||[]) & groupnames).empty?}
-
-# Buffer the output to avoid EPIPE when the reader hangs up early
-output=""
-users.each do |user|
- if user["ssh_keys"]
- user["ssh_keys"].each do |addr,key|
- output+="#{key} #{user["fullname"]} (#{user["username"]}) <#{addr}>\n"
- end
- end
-end
-print output
diff --git a/bin/uid-map b/bin/uid-map
deleted file mode 100755
index 90dd472..0000000
--- a/bin/uid-map
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-# Usage: uid-map
-
-require 'yaml'
-
-users = Dir.glob("users/*.yml").each do |filename|
- uid = filename.sub(/users\/([0-9]*)\.yml/, "\\1").to_i
- user = YAML::load(open(filename))
- puts "#{uid}:#{user["username"]}"
-end
diff --git a/dev-imgs/aurelien.png b/dev-imgs/aurelien.png
deleted file mode 100644
index 59fca0f..0000000
--- a/dev-imgs/aurelien.png
+++ /dev/null
Binary files differ
diff --git a/dev-imgs/coadde.png b/dev-imgs/coadde.png
deleted file mode 100644
index 7fd03c7..0000000
--- a/dev-imgs/coadde.png
+++ /dev/null
Binary files differ
diff --git a/dev-imgs/emulatorman.png b/dev-imgs/emulatorman.png
deleted file mode 100644
index eded2e5..0000000
--- a/dev-imgs/emulatorman.png
+++ /dev/null
Binary files differ
diff --git a/dev-imgs/fauno.png b/dev-imgs/fauno.png
deleted file mode 100644
index 24a68ee..0000000
--- a/dev-imgs/fauno.png
+++ /dev/null
Binary files differ
diff --git a/dev-imgs/gaming4jc.png b/dev-imgs/gaming4jc.png
deleted file mode 100644
index 775804c..0000000
--- a/dev-imgs/gaming4jc.png
+++ /dev/null
Binary files differ
diff --git a/dev-imgs/lukeshu.png b/dev-imgs/lukeshu.png
deleted file mode 100644
index 719ca13..0000000
--- a/dev-imgs/lukeshu.png
+++ /dev/null
Binary files differ
diff --git a/dev-imgs/mstreet.png b/dev-imgs/mstreet.png
deleted file mode 100644
index 678ea73..0000000
--- a/dev-imgs/mstreet.png
+++ /dev/null
Binary files differ
diff --git a/dev-imgs/ovruni.png b/dev-imgs/ovruni.png
deleted file mode 100644
index 6c40d21..0000000
--- a/dev-imgs/ovruni.png
+++ /dev/null
Binary files differ
diff --git a/dev-imgs/shackra.png b/dev-imgs/shackra.png
deleted file mode 100644
index 89780b5..0000000
--- a/dev-imgs/shackra.png
+++ /dev/null
Binary files differ
diff --git a/dev-imgs/sorin-mihai.png b/dev-imgs/sorin-mihai.png
deleted file mode 100644
index dd3c1ef..0000000
--- a/dev-imgs/sorin-mihai.png
+++ /dev/null
Binary files differ
diff --git a/dev-imgs/zenhack.png b/dev-imgs/zenhack.png
deleted file mode 100644
index bad76d4..0000000
--- a/dev-imgs/zenhack.png
+++ /dev/null
Binary files differ
diff --git a/misc/git-shell-commands/change-description b/git-shell-commands/change-description
index 60db0ac..60db0ac 100755
--- a/misc/git-shell-commands/change-description
+++ b/git-shell-commands/change-description
diff --git a/misc/git-shell-commands/change-owner b/git-shell-commands/change-owner
index 6b6f353..6b6f353 100755
--- a/misc/git-shell-commands/change-owner
+++ b/git-shell-commands/change-owner
diff --git a/misc/git-shell-commands/create-bare-repo b/git-shell-commands/create-bare-repo
index b4d2d5f..b4d2d5f 100755
--- a/misc/git-shell-commands/create-bare-repo
+++ b/git-shell-commands/create-bare-repo
diff --git a/misc/git-shell-commands/delete-repo b/git-shell-commands/delete-repo
index 5ef94b1..5ef94b1 100755
--- a/misc/git-shell-commands/delete-repo
+++ b/git-shell-commands/delete-repo
diff --git a/misc/git-shell-commands/fetch-mirrors b/git-shell-commands/fetch-mirrors
index 15bf9c4..15bf9c4 100755
--- a/misc/git-shell-commands/fetch-mirrors
+++ b/git-shell-commands/fetch-mirrors
diff --git a/misc/git-shell-commands/help b/git-shell-commands/help
index f1d116b..f1d116b 100755
--- a/misc/git-shell-commands/help
+++ b/git-shell-commands/help
diff --git a/misc/git-shell-commands/hook-install b/git-shell-commands/hook-install
index b38836a..b38836a 100755
--- a/misc/git-shell-commands/hook-install
+++ b/git-shell-commands/hook-install
diff --git a/misc/git-shell-commands/mirror b/git-shell-commands/mirror
index 8282e9b..8282e9b 100755
--- a/misc/git-shell-commands/mirror
+++ b/git-shell-commands/mirror
diff --git a/misc/git-shell-commands/mirrors b/git-shell-commands/mirrors
index 436564f..436564f 100755
--- a/misc/git-shell-commands/mirrors
+++ b/git-shell-commands/mirrors
diff --git a/gpg-init.txt b/gpg-init.txt
deleted file mode 100644
index 00a17ef..0000000
--- a/gpg-init.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-%echo Generating Parabola Keyring keychain master key...
-Key-Type: RSA
-Key-Length: 1024
-Key-Usage: sign
-Name-Real: Parabola Keyring Keychain Master Key
-Name-Email: parabola-keyring@localhost
-Expire-Date: 0
-%no-protection
-%commit
-%echo Done
diff --git a/misc/git-hooks/auto-deploy b/misc/git-hooks/auto-deploy
deleted file mode 100755
index 02a22e7..0000000
--- a/misc/git-hooks/auto-deploy
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# auto-deploy
-# Usage: auto-deploy /srv/http/repo
-
-# fail on any error
-set -e
-
-# Can we write on the clone?
-test -w "${1}/.git/HEAD"
-
-alias git="git --git-dir '${1}/.git' --work-tree '${1}'"
-
-# pull this repo on the current branch
-git pull origin $(git rev-parse --abbrev-ref HEAD)
-
-exit $?
diff --git a/misc/git-hooks/generic b/misc/git-hooks/generic
deleted file mode 100755
index ebf56f4..0000000
--- a/misc/git-hooks/generic
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# Generic hook, installs itself as a valid githook(5) and runs whatever it
-# finds on hacking.hook.$self
-# Format:
-# hacking.hooks.post-receive.auto-deploy /srv/http/markpower.hackcoop.com.ar
-
-git config -f config --get-regexp "hacking.hooks.$(basename ${0}).*" | \
-while read hook repo; do
- hook="`echo "${hook}" | cut -d'.' -f4`"
-
- ${HOME}/.ssh/git-hooks/${hook} ${repo} ${@} </dev/stdin
-done
diff --git a/misc/git-hooks/hackers-update b/misc/git-hooks/hackers-update
deleted file mode 100755
index b78c54d..0000000
--- a/misc/git-hooks/hackers-update
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-# post-receive hook, updates /srv/git/.ssh after pushing to this repo
-# install:
-# git clone hackers.git .ssh
-# cp .ssh/git-hooks/post-receive hackers.git/hooks/
-
-# fail on any error
-set -e
-
-# the ssh dir
-ssh_dir=${HOME}/.ssh
-
-# pull this repo
-git --git-dir ${ssh_dir}/.git \
- --work-tree ${ssh_dir} \
- pull origin master
-
-# secure the files (sshd will refuse connections otherwise)
-chmod 600 ${ssh_dir}/authorized_keys
-chmod 700 ${ssh_dir}
-
-exit $?
diff --git a/users/1000.yml b/users/1000.yml
deleted file mode 100644
index 2a7dc57..0000000
--- a/users/1000.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-username: alfplayer
-fullname: Esteban Carnevale
-email:
-- alfplayer@mailoo.org
-groups:
-- hackers
-pgp_keyid: 2DFFE834A07FC9A06F4AAAF444BC7D7F49B9A5A4
-ssh_keys:
- alfplayer@mailoo.org: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDw0O6ggkadO1LV717MrH3jpc4ZHjN6ErwpOd9p9NvEE+qDiyWG3VBai8C3m5uZeG6dMiYOYK1uIOm14Y3f7KIFxPar7Fu2wJvU4n2mmdePAKjX4cMKTXWKGflbJ5spA75Ha86WW3QB1AX7UdfJHfJmBjYLo4nPTRqJOg/vXUxwMI9dTmmucJOVSpp5RueKAbOlDnbIJB3CABLSJn9L8Fo89vw/nyVEK87GBOWcrdg3gjr4FFbbiWTZhe3gROP776En/up5PwQjIyfjno7sMPu0nzHn11WCSH8mDl5bhU9mxLaKfPzo6bg7OGoTjeCOH8iXwowRVg/TYZ0+/B2APJ3x
-shell: "/bin/bash"
-extra:
- other_contact: alfplayer - Freenode, OFTC, identi.ca, others
- roles: Hacker, packager, others
- website: http://alfplayer.com.ar
- occupation: System administrator
- yob: 1983
- location: Buenos Aires, Argentina
- languages: Spanish, English
- interests: Free software, GNU/Linux, software development
- favorite_distros: Free distros
diff --git a/users/1001.yml b/users/1001.yml
deleted file mode 100644
index b9ad5c1..0000000
--- a/users/1001.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-username: n1md4
-fullname: Jonathan Gowar
-email:
-- jon@whiteheat.org.uk
-groups:
-- ssh
-shell: "/bin/bash"
-extra:
- roles: Administrator of server hardware
diff --git a/users/1002.yml b/users/1002.yml
deleted file mode 100644
index cd0eaff..0000000
--- a/users/1002.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-username: aloniv
-fullname: Alon Ivtsan
-pgp_keyid: 1E81576B94D05ED2615140BC8F564D05CBDA985E
-ssh_keys:
- alonivtsan@lavabit.com: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEIrsRSzBwU67GBHiEAVlvnDiAI9+MMiIIw0ptkvkklGKwqNwI7WWHzkvdvqzyEHjnvIYchTMK8ABYUSPdz2g6WnCAB0rP3BEF239jh/d6la+Kr/qZcKobkSgoAig2fcLLIKxUP7yyNB9Z/dkKm2KEi5a2NrJBi2kru0JtyjxNlGT64+OBR7dSPCkoLStA9nt9AtK5Dx9d52pFvdMiaORQNU10y7T7m3Amsebn4F44gc+N/wTbqcxJlYXy+N/E/Qjs+dyfWad64WsMwmmje6HiV8QEgMdU2WBtyr+pXyNSe1nOtZgcYsSSnjRsu15WQkrsKEZrhtbrmC0Z784vqZ37
-shell: "/bin/bash"
diff --git a/users/1003.yml b/users/1003.yml
deleted file mode 100644
index d53537a..0000000
--- a/users/1003.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-username: aurelien
-fullname: Aurélien Desbrières
-email:
-- aurelien@hackers.camp
-groups:
-- hackers
-pgp_keyid: 560B3DEC2F13E822ACED475B2EC52AC76AEEB6A0
-ssh_keys:
- aurelien@hackers.camp: ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAAjdFhdsKWZi7FlTQ9zU0XAdFIzCLoXEBWuCaaiPMVtOx9bEvvEzYu+RHbeWDDbN2OjDvYZvReg0TMg5BM6KlRajQHoAEkJY1C1FNbrJG88KFTj/RxheTV+5aNUxw2WGsRl2VMfSBnd49T5fbz2JCV+1pg6SPTRP3mamuBAH9jrYXO2Ww==
-shell: "/bin/bash"
-extra:
- other_contact: 'IRC: aurelien on irc.freenode.net'
- roles: Parabola Hacker, Packager, French Support
- website: http://www.hackers-lab.org
- occupation: Free Software
- yob: 1975
- location: Corse du Sud
- languages: French English
- interests: Sciences
- favorite_distros: Parabola GNU / Linux-libre
diff --git a/users/1004.yml b/users/1004.yml
deleted file mode 100644
index d2ce805..0000000
--- a/users/1004.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-username: brendan
-fullname: Brendan Tildesley
-pgp_keyid: BC88635CDC4B0920A4302E3BA8153DEAFCED02BB
-ssh_keys:
- brendan.tildesley@gmail.com: ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAESej3WeXUB8uDd246AfXj+DGzCJbMR2CJ23wVimI5MCtJIjVBnbjnNa+5IOti+aY4zR4QsA4hsYJznk6HEImhu2AAS7h8DQthCK2QVhgXezpzVg/38S9LHnGg2h2Z/dreGVxYv//3Xs9S3OUWH9ycdd/+Se5WWSosVKb0i8x0tviFhrg==
-shell: "/bin/bash"
diff --git a/users/1005.yml b/users/1005.yml
deleted file mode 100644
index c708e60..0000000
--- a/users/1005.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-username: coadde
-fullname: Márcio Alexandre Silva Delgado
-email:
-- coadde@parabola.nu
-- coadde@riseup.net
-groups:
-- hackers
-pgp_keyid: 684D54A189305A9CC95446D36B888913DDB59515
-ssh_keys:
- coadde@parabola.nu: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOmZ88SdJDJT4bEaESC93HZLHydiigKS0LW8NOsmQgfL
-shell: "/bin/bash"
-extra:
- other_contact: Freenode:coadde | gnusocial.net:coadde | Tox:63C99A8498CEA4900ED85CB113F22C0D61566E6E2AD0EDBF8A4FD781F0691852070B2850FA7C
- | XMPP:coadde@parabola.nu
- roles: Parabola Hacker, Package Monkey
- occupation: GNU Sysadmin/Security, Graphic Design & Animation
- yob: 1988
- location: São Paulo-SP, Brazil
- languages: Portuguese, Spanish, English and Galician
- interests: Free software and ecology advocacy, 3D design, free art and computer
- science
- favorite_distros: Parabola GNU/Linux-libre
diff --git a/users/1006.yml b/users/1006.yml
deleted file mode 100644
index 0f1e4ea..0000000
--- a/users/1006.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-username: drtan
-fullname: Drtan Samos
-pgp_keyid: 69639F93426CF7CF074E9DF5D5E9DD655D2AE3BC
-ssh_keys:
- drtan@lavabit.com: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCr4f39/SpmrgR8qNj2spPLNS3ZaaEY82JOv+XUKR1QNWbRtimCtXyPmIOCKx2D/V0WAzLaRs8WDrK28RMv2ZN/pDwGYBubmQUp+dOrdDdmks6lUMsK4Q5kM2ZZEd5yqSC5FWCAJG8oIbWCPbMXNciHjy0ZLVpwBpgJf3bEnfc/+q2YufTH4C6girRcBExuk21DckPu9L4iHEWq60O7hG8hy/IbL7rCuGhUF3tYm+9v3yROn1mN6l4WcsT/BDVqpFw9PDTyGqqu4cbfrvmoZ1+ghCzXK+7fu1PaxE890iSGpuqyzA677f8zuzOaCOJk+SVeFqJvRAF3ehOS8O9v01SB
-shell: "/bin/bash"
diff --git a/users/1007.yml b/users/1007.yml
deleted file mode 100644
index 854dd9a..0000000
--- a/users/1007.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-username: emulatorman
-fullname: André Fabian Silva Delgado
-email:
-- emulatorman@parabola.nu
-- emulatorman@riseup.net
-groups:
-- hackers
-pgp_keyid: C92BAA713B8D53D3CAE63FC9E6974752F9704456
-ssh_keys:
- emulatorman@parabola.nu: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMW0IzaOtWYEaDaAlWq7MlvXlSETzK+FN8OIsZSHVXUs
-shell: "/bin/bash"
-extra:
- other_contact: XMPP:emulatorman@parabola.nu | Freenode:Emulatorman | gnusocial.net:emulatorman
- roles: Parabola Hacker, Package Monkey
- occupation: GNU Sysadmin/Security
- yob: 1986
- location: São Paulo-SP, Brazil
- languages: Portuguese, Spanish, English and Galician
- interests: Free software and ecology advocacy, 3D design, free art and computer
- science
- favorite_distros: Parabola GNU/Linux-libre
diff --git a/users/1008.yml b/users/1008.yml
deleted file mode 100644
index 8e9ac83..0000000
--- a/users/1008.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-username: encyclomundi
-fullname: Charles Roth
-email:
-- encycl@a2c3.co
-groups:
-- hackers
-pgp_keyid: B70107A3E6A744682A22208D7D19D1AFDD312BBE
-ssh_keys:
- cer@parlementum.net: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDT7izplG/01mblfcGdxmeSXJpHOpHhv8CewwQ3F2h7yRaOjvc2i5KfIrvkOmc5Z1YIP+dchN8fCmnqz44LJeK0LRaXcBcRkGc52MINY7v4h15OSq3psethU0eEa8n4L1mXR44wR1ZZanqSHARngXZPgKBGsEVnDK7h578SgFLc0xnNAwyAMwEWEF3d8qK3H1V7uqrjV9M9LeniR49ouKToLxjgKeFKtBEfWuxoFWc92sfcKkQ5dw4P0+y3pkCc5hZkMtijOhN6IdTKmwdJkihBeorXf92Caj1WOoFeG4Y5dmesAujOPAYC0UF803HtIu9r7ZqbLXxrLce4zyE7YM/z
-shell: "/bin/bash"
-extra:
- alias: encyclomundi, cer
- other_contact: 'Jabber: encycl@a2c3.co'
- roles: hacker, wiki contributor, official historian
- website: http://a2c3.co/encycl
- occupation: Cultural Detective
- yob: 1966
- location: Spokane WA USA
- languages: English, Latin
- interests: history, art, literature, FLOSS, reading, cooking
- favorite_distros: Parabola GNU/Linux, Archlinux,
diff --git a/users/1009.yml b/users/1009.yml
deleted file mode 100644
index 2fa5b63..0000000
--- a/users/1009.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-username: fauno
-fullname: Nicolás Reynolds
-email:
-- fauno@parabola.nu
-- fauno@endefensadelsl.org
-groups:
-- hackers
-pgp_keyid: 49F707A1CB366C580E625B3C456032D717A4CD9C
-ssh_keys:
- fauno+0@parabola.nu: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvfHmOPEkkj3t5iPQ+u2gepTSqVhMTbvylQirCAAQLfjjsWHXTFpWFV8voogSYaOetcV8vHB6TZJom037El4t/23kgyumfxG1Fly8hr7oQmLCIwQ8adZ1dmJpTbPyBvYS+fxtLOTyESsDNiB47W47uP2TxPl+x5yixhJunpEDfpzxhgowA3xwfdqOv2gkrLG8yGNLJHBkGdP0988v70C/Li5sZMHGexIZgsVCAbM4YfsSPKCteevCTSbL6PFgNUsx4/E/FBb31lhmyb0g5iFnbKMgwgyPBcVHZMU7aTuxMCvaIToPoCN+pLvnJoVuI5mRLmfjYygRxec12YKV7I6yIQ==
- fauno+1@parabola.nu: ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAGF017csJzb1zpqUXqBf2/aSOVRwkweSL6JujlQuhG0SEM+tV/YSHMaZaV2eddJfEm5E46tHUxuAoFx1GI44wyY0ADCZHpE8WE5aPVxTI2dBMTpa97O6WlkqkzEQ+5nQJ4Jhdm4Rmkb13pZypzxqcv8QXtpVXe2KFPmw+aPuVZ6X5tyYg==
- fauno+2@parabola.nu: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDH/E0aI3Jtva+HkZJBh7cexZGsqYoLCMM2cdt3L4/YODtzwdcC7Jw1rH0Y5Vt884SkRN4tWu2poWKAVQu0Mk97BuoPA1XYfUn+XxytnNMwXwh+PG/ruLJiBHTEmzaL98LqngbOejZ2U3FicLhO8uhLGpAP1g+JrTiBdtDPIldQI2j13SYOE1P/eqSXj82v/YYFfDBlqfP5VTbz2Bg/NFeYKM16zKq/lwLzGux/zHTavkItEwicVG5plrwC5oiyJ6/IbNmUGUQ3qIpKNoyiWuWNA/c5hifFIjFH/pWCJl8JYzTB0D6uFz64v3e8bDxQe6zJp5JiwvaWZ0Gq65BsKPCl
- fauno@parabolagnulinux.org: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC50/jQk3jtHE4sXUKSFSIVlZVjvAN0XvBAu2jN9xhWzvQulXua7C+k58YHJN/qMu/MRWN6ggRmNqG6y0gYe48p55cHVRLzxFu5b0W0cywHIyJ/odL5BAFVQp2pkgPgfkHEQtbeRPWWGCDrlYKU29ufvInetlT7OXRFOt4DLmc6bSl39idfLZ1f2Vj2TpNeVUpv34dDUDHyaBxnrzI3R4JwCTNNARJcatMbzKHkHHcZM4ALl8jJWsSnU+K7xFaB2MaHay8FmeDw6c3Rg7uSrw5SK9HE9Qid+NWuIPmUNlUjvDjBuaBxwflHtR5puIu8JnAq5rf+Wztwgie2y4hf9fPZ
- fauno@yap.local: ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPCc9VbjRZhaETQkkdAEQ9TQrWO/57rpRiDXECiMTMSNAp54CyIrXRmtcnC1ck4ZLDgJp2C9CiPe5zLRFwz0D7E=
-shell: "/bin/bash"
-extra:
- other_contact: irc:fauno@libre.fm/hacker/fauno
- roles: Parabola Hacker, Package Monkey, Mips port
- website: http://endefensadelsl.org
- occupation: cooperative worker
- yob: 1984
- location: CABA, Argentina
- languages: Spanish, English
- interests: Free Software advocacy, etc.
- favorite_distros: Parabola
diff --git a/users/1010.yml b/users/1010.yml
deleted file mode 100644
index 992324c..0000000
--- a/users/1010.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-username: guestone
-fullname: Guest One
-email:
-- theguestone@gmail.com
-pgp_keyid: E511343A987CB73D883EFB7E5CECF9F86574BEF2
-ssh_keys:
- theguestone@gmail.com: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCfm8nzwgXNSSxcakjSGXdvMMLeJZvRJj/B81y5t7BN22Diciv2dFtw0QFNqtBRB1OW5ASrCEez+0/f3seOijaHUO2ZNddhg4j3co1S/DFY6lBD/VBE3zFeafTe6Kn+a8b2HZ5ndYTw3HugwieqGEjLdhsn7h5ulm/SBVGZo2s9XMXgSjxfdUYthNxZaySIDQZ2lLvFq1hmdSp9fKq82MimqWR0Xpm4CB0gUic7WUHOLJGJMwXU4fRygVU8azc2hrJ4ZWtf2hpgQJUAK0lxoN/5pVLmQa24Gp3jkAWPrv7o9YOqrWfjzpeXMkA2LbbzINDm7X4uQxfNpuL/EaKks4x
-shell: "/bin/bash"
diff --git a/users/1011.yml b/users/1011.yml
deleted file mode 100644
index 378a27f..0000000
--- a/users/1011.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-username: icarious
-fullname: Aditya Som
-email:
-- icarious@parabola.nu
-- icarious@hacari.org
-groups:
-- hackers
-pgp_keyid: 6C37E88EDD0BF0427A15676E4428BA28AA2ACCD2
-ssh_keys:
- icarious@hacari.org: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7anZl48D3vok6vuhu6w4Obb1gxm7r0BmUQZ8rxsx2WtSEph1ZaX+D5ROlctQgBZxdw/aADFLuuh4mWHxf9JHpMnzfWeUtUpB0uUfLz+25RqNP9/cIPX0PhcQ2616d50QQyYxh0Q17sL16FN3nvqW5J8bp2P7PYDBwfPRLO3nvnWnWSimQNRx0o5vrBrYk5Q7B/pfUIluw5rIPAag+CIFsBIGKAqcL6Qcx9Ldg0j7Ej0N6iwxv2PIw7mtT1BARerF9jx/eMwrSniie2mNJ+ktRyppJKcainILDzs2NkY5jxQZQUTwFeNf/N/ZcvjDikOnPxlVWCxAGhsgYYd19SMd7
-shell: "/bin/bash"
-extra:
- other_contact: XMPP:icarious at gnuos dot in | Freenode:icarious
- roles: Parabola Hacker, FSDG Bug Reporter, Wiki Editor, Live ISO Developer
- website: https://gnuos.in
- yob: 1988
- location: Kolkata, West Bengal, India
- languages: English, Bengali, Hindi
- interests: Free Software/ Free Culture, Computer Security, Travelling, Photography,
- Cooking, Knowledge
- favorite_distros: Parabola GNU/Linux-libre, FireFly GNU+Linux
diff --git a/users/1012.yml b/users/1012.yml
deleted file mode 100644
index 2c4d223..0000000
--- a/users/1012.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-username: jbeatty
-fullname: Jonathan Beatty
-email:
-- jbeatty@computer.coop
-groups:
-- fellows
-shell: "/bin/bash"
-extra:
- alias: jbeatty
- roles: Wiki Admin, Hacker Wannabe, Freedom Troll
- occupation: Chess Geek, Hacker/Sysadmin Wannabe
- yob: 1991
- location: Memphis, TN, USA
- languages: American English, intermediate German
- interests: Socialism, philosophy
- favorite_distros: Parabola GNU/Linux
diff --git a/users/1013.yml b/users/1013.yml
deleted file mode 100644
index ae0b2c2..0000000
--- a/users/1013.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-username: jorginho
-fullname: Jorge López Seijas
-email:
-- jorginho@parabola.nu
-- jorginho@riseup.net
-groups:
-- hackers
-pgp_keyid: 8C3F8ABD30DF2AFAC6C039A45906AB5E9AAD00E5
-ssh_keys:
- jorginho@parabola.nu: ssh-rsa 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
-shell: "/bin/bash"
-extra:
- other_contact: XMPP:jorginho@parabola.nu | Freenode:Jorginho | gnusocial.net:jorginho
- roles: Parabola Hacker, Wiki editor and translator
- occupation: To learn about GNU/Linux and Computer engineering
- yob: 1994
- location: Santiago de Compostela - Galicia - Spain
- languages: Galician, Spanish, Portuguese and English
- interests: Free software and GNU/Linux
- favorite_distros: Parabola GNU/Linux-libre
diff --git a/users/1014.yml b/users/1014.yml
deleted file mode 100644
index bcc4678..0000000
--- a/users/1014.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-username: lluvia
-fullname: lluvia
-pgp_keyid: 5BDCF80CFCE5298696B88FF3B2A551203712CD90
-ssh_keys:
- lluvia@singularity.fr: ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAHp4GDKxOqINt056ct+q2woZKGt6iJ8T/bK0H/sdOBwkWFOI9GiBBui/fdpm9pIiUJKZ8u6BpmlKpRJIKfvVXn6FQFEHIBGATQIqKk0s0nwMCb/a6q3hmla54pm+n5Bs5MYtZgJt8VQ6QYsDVnsF8BvvjDGj/ShjsVyuLzXl1Nu6QKWUA==
-shell: "/bin/bash"
diff --git a/users/1015.yml b/users/1015.yml
deleted file mode 100644
index 866cddc..0000000
--- a/users/1015.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-username: lukeshu
-fullname: Luke Shumaker
-email:
-- lukeshu@sbcglobal.net
-groups:
-- hackers
-pgp_keyid: 99195DD3BB6FE10A2F36ED8445698744D4FFBFC9
-ssh_keys:
- lukeshu@lukeshu-gluglugt60: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDPTz2guGQBvmC14hlyhrfkZQK4OdoEyTpXkzEgJMnhZwoKu2fp++yaloZO6Te3SMCreAUoOB5bYCENAtmRZtb7NOy/nYA5qNoPz+behx6zec0S2zLMEpgYKmdLVoazbVlczdMWtHrozcThkI1q9eje+QB6spNeaWqxaNvhA48K0QxjcPzUxDDd/uIHDuOHZlhiSUx1NbhWV2GekHmS+Aq4ROXSfJrRK3ZdyR4FK/hJKDUHJGvd9m39ytsvVAtH749SUOz9NmCGs2Mj1ROMbyBR0tR/Ce7XexrnN+BRYw7G9klu+ag9xMfXYmfWGKBTr7HD2RR0kptURi110aW9POqz
- lukeshu@parabola.nu: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCp8vnIcUde+zQ3nVGkcZr7jsTNMZbMhdwDxn2igXxgng4eyWSTkwPIztIIsCn+WiH/13VsVGdT1d1PL3usnpNk0kpXJA5ZG+pSLDT9iZizzuLPIV8S+QgdW5nASu0D2a1ZiYT/MkekmVBoKdkyeaipALxARVPFOgJ9ceoestB8SaX+oVnwIdByXQ7a56Dq7TlIDxoDbMKtjaDZRAImaZAxHrvnY3ipSRFdPT2hSkNMuwC6tXOWD69KsSnQBLA6ssbrfrp5EK0T852KV0MW1FXZz+ObK4moW5GtFbeouw1ZMBzmKX7ekgrKxl2p6sxVdWKjowbcCQfIhwUCc+hJbQDX
- lukeshu@sbcglobal.net: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1OwEmbhtgmjcH/rPTSCEXHCOHyz9YbbeMF0sGzGpx5aaQWfiRWzHDHXj8in7Ub8M1K0G+J1yzjxXyWfmg4DUgt8HQkLRkHVSZOg3LVxGY99ZJ6EsM4nCq4VO4LEff/9ZCGDk4x/MvGoDh33VIHI2c3KY7Aky2MKHIaWjojhtMIcFzrNU5ALqAVfJn6+CYJje0ZJKM7cFscnnyXP1AzC1amR9vHHWgsgmCE9olKbrVelZgYjBJL8+8jIxjQZLRhBz/KAa5tGwvgVCxR8zrBHVrEwXzzzHYEMocW4LVjlyZIcUNu/HBO1NHZSCbDoUuLmquSaH4QDJ7dscDdoTBrtvEw==
-shell: "/bin/bash"
-extra:
- other_contact: 'irc freenode: lukeshu'
- roles: Packager, libretools/dbscripts hacker, website maintainer. Reluctant Reddit
- moderator. Formerly, wiki guy.
- website: http://lukeshu.com
- occupation: Student, code monkey
- yob: 1993
- location: Indiana, USA
- languages: English
- interests: Freedom, Computer Science
- favorite_distros: Parabola GNU/Linux-libre
diff --git a/users/1016.yml b/users/1016.yml
deleted file mode 100644
index 1762cc6..0000000
--- a/users/1016.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-username: mstreet
-fullname: Mariano Street
-email:
-- mstreet@kde.org.ar
-groups:
-- fellows
-shell: "/bin/bash"
-extra:
- alias: mctpyt, mstreet
- other_contact: "{mctpyt,mstreet}@irc.freenode.net"
- roles: wiki administrator, Esperanto translator
- website: http://mctpyt.com.ar/
- occupation: Student
- yob: 1993
- location: Rosario, Santa Fe, Argentina
- languages: Spanish, Esperanto, English, some French
- interests: freesoftwareism, Esperantism, federalism
- favorite_distros: Arch/Parabola
diff --git a/users/1017.yml b/users/1017.yml
deleted file mode 100644
index 1d1c9f4..0000000
--- a/users/1017.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-username: mtjm
-fullname: Michał Masłowski
-email:
-- mtjm@mtjm.eu
-groups:
-- hackers
-pgp_keyid: DC7E500D8D4407641EA82893476DC656262FB1AE
-ssh_keys:
- mtjm@mtjm.eu: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEApvBWb8JF4dsJlFsoT8pJLj/X25sHDY6W1bdffPsTKeX9ID7VHaLWHS2b/PZTGYJUmUVfeZ1ELr8s2XKmLJP74o4cCxdCn9fD0Yz5rc6yP4m8qTzzhL8wFyq9fCB07d0Z6FraXtrOiOI2Mo5VMviHDinJnRnuQnLYb17g5+ThCmlspPkIelUBs2HCa8GvhgteW4ldCmcn4r1VL36/sYyhB5jBycmGsFi8Z4gSxZZjvuAVrQEmaJmWkoI2YCIOXUh1yUUWAE780sdNCNsuMyOXn0H2W4Z/sPUj4Of/hzQwzs/u0YUSn217I8M3XG0v0jcx0o3t3mnV3AKI/Cu0z8j1oRX74/IPVo6qglHWlPtt4vlC//Qz/s2QmdeHf2PlduTVp76x7ugKepd1hAGT0b+dIm/WaFB6ZXcIL2In1klOjD8COmAD3R/Zs0jxGs68eBLHi0qRra/KQvS8wa5/EVi9HCu+U4Kj3Ag7QbZk7mcNnJLgf88dEjVOhtIGl3+81iLT64G6+J6nDC5GpMK9h/KZ/SX3oa2zO0Z9yqn3BN8Im3DrYnt3Uw0CJA5u42/IAhDlFr01HfIKmTNRDc5aZzZ7BrM46UyDw4AviUKBZNr5z12RBueCTSQkzHtY+5UeamloPyj90Kl8gj7hGn5grY0SCVeDKbOeecED191ACFhFT1M=
-shell: "/bin/bash"
-extra:
- other_contact: 'IRC: mtjm at freenode'
- roles: mail admin, former MIPS developer, license verifier
- website: http://mtjm.eu/
- yob: 1990
- location: Poland
- languages: Polish, English
- interests: freedom, texts
- favorite_distros: Parabola, Trisquel, gNewSense
diff --git a/users/1018.yml b/users/1018.yml
deleted file mode 100644
index de26acd..0000000
--- a/users/1018.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-username: ovruni
-fullname: Omar Vega Ramos
-email:
-- ovruni@gnu.org.pe
-groups:
-- hackers
-pgp_keyid: 1B8C5E87702444D3D825CC8086ED62396D5DBA58
-ssh_keys:
- ovruni@gnu.org.pe: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC0oW8fMWflGDouX+SAVtedYtdSoWl3XnYzxIJu2DbAADAAmfuyH3D8mHGmhAZJeGlB2Srto4hgqj/VxR0ODWhlWA1wxjM5Jwlj6bGOsgfHQ2iZc0CDYZxqhQPROPlaue4yPXqqTezbSPPPlCMd18K73Ar5EbBii8RsKLUor1h5NWORBBTLnrR13KDZ29kGOC2DjCEu/hBhEj3qIyDoXNi13SgFy/XAPZikAOYnnGZw+3gsR8PuulTvKcYlzACoPt2hvD5nJxPtuBV+G4Q5MFYE23hyPtJRK1VWzcSI59CUS6zM8j08vCxpOA6jw6NTCS2yc3pwpdtXPQnaOZCz1UW1
-shell: "/bin/bash"
-extra:
- other_contact: 'jabber: ovruni@jabberes.org | IRC: ovruni at freenode.net | ovruni
- at Identi.ca'
- roles: Parabola Hacker, MIPS port
- occupation: Student
- yob: 1986
- location: Lima, Perú
- languages: Spanish, English, Portuguese
- interests: Freedom, Free Software, Web development, Politics, Free geographic data
- and mapping
- favorite_distros: Parabola, Trisquel, gNewSense
diff --git a/users/1019.yml b/users/1019.yml
deleted file mode 100644
index c41f74a..0000000
--- a/users/1019.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-username: rmsad
-fullname: Rafik Mas'ad
-email:
-- rmasad@gmail.com
-groups:
-- fellows
-shell: "/bin/bash"
-extra:
- alias: Azag, rmsad
- other_contact: 'msn: rmasad@gmail.com | irc: freenode: Azag'
- roles: Parabola Co-Founder, Plain hacker
- occupation: Student
- yob: 1991
- location: Santiago, Chile
- languages: Spanish, English
- favorite_distros: Arch/Parabola
diff --git a/users/1020.yml b/users/1020.yml
deleted file mode 100644
index d333bf8..0000000
--- a/users/1020.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-username: shackra
-fullname: Jorge Araya Navarro
-email:
-- elcorreo@deshackra.com
-groups:
-- hackers
-pgp_keyid: 6DC925A471AACC8B4EF9F9AEBDAD9605F06AA3BB
-ssh_keys:
- jorgean@lavabit.com: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCkLc4Ev5ADx1psS056kl0rn2ljuo8VBiH+NjNv2ohPCBNlW3GhzpqGTECN9pYA7BYiyzBmKgC971OJiKsG/5R+m9L5SsZ2v9h7b9IgZlLMYvrJftEvJQL8aVnPlU3CGtc5sjlgktREGjc9lOVXl4AWgR+3Ui3QIyD0TqXBRWZoPGx7UwnMUfdwfI70mikQYei69uPST9zbSX28TfGczZbZNyL6N+7jM4LPXFZ5pVC1XjsKOdkJ6XhaOHe8zb6DJ0eS1PUUnUzoQVtfXnddvuZl1EgY6Y6ErIUNdIJvyA0jghuD1EohvHGissXBl01jbj59bbvIdYMPxZmaZf4hQtgF
-shell: "/bin/bash"
-extra:
- alias: Shackra
- other_contact: 'Jabber: jorgedice@blah.im | SIP: jorgean@sip.linphone.org | in any
- IRC server: shackra'
- roles: package monkey
- website: http://elblog.deshackra.com
- occupation: Freelance software developer
- yob: 1990
- location: Siquirres, Costa Rica
- languages: Spanish, English, Esperanto
- interests: Freedom, Apologetics, Catholicism, Judo, Jujitsu, GNU/Linux, GNU/Hurd,
- Python, Free Games, 3D, Gimp, Inkscape, Scribus
- favorite_distros: Parabola GNU/Linux-libre, any (stable) distro with Hurd
diff --git a/users/1021.yml b/users/1021.yml
deleted file mode 100644
index 70ff72d..0000000
--- a/users/1021.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-username: sorin-mihai
-fullname: Sorin-Mihai Vârgolici
-email:
-- sorin-mihai@vargolici.com
-groups:
-- hackers
-pgp_keyid: DE8B63715BAA521666340836A763C29157A016B6
-ssh_keys:
- sorin-mihai@vargolici.com: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDFBk9laSg8JcxW9lL8u6BM8WG/l2U/a+rtIUgX9z7d2cvHlXlmjK5guwY+JPvg3mw1Lnp8fdC7q0SUiQg9Llh5tnhZbqao4gaNTZ628amHRPf/N2AvlwXxhmIhrPkCIqLeWYd4HJbu273snA1U+KYWOsi1606N4s32oFW1LfYSZdu4hpCQ/KpHPGkl+nKUNdo8QvTygsKgHTAwWJftPlSgChjDMzcQnCJqDmcujnxtSqtxAId7XHsq/RAQlCj47r/co+pbPRhKjAiedA3HyHYyvq1N2LY9LWctRE3tToTV1sEXCKqmftC2pvbpIifuzkI7cnSTWrbzwMqJdAC/MQkVeZD74284Cf2SpgvRHi/WPXWkSKYX5dUWmXxVuKlGLbr0nqScSi89RUbL9aHx52QXWpncxWjntbXmCpPNGlBErosPerwKg4odZ3N2rvBDm9xt8M5WAMShgXyMdfPdF8emz0GwkSThk/mECt02ISD39SclpNsIENmli8uB1z9Y74nE2bKFWpxDsGhF3/F7jWSnIwwtrcpzAGz6OnW0Ii26wndEPq7oXCJJphzDENesQAg4Ra5HMMXl6BdgzA6ViDzYcSR8AwHKiIeUHsC3pTTQoOnVNlbRc0cwhtoK46mGR50MZ9KG0WhVBm6agjtSFXLdYwh8zqIxf71jwBII7Q651w==
-shell: "/bin/bash"
-extra:
- other_contact: sorin-mihai on freenode
- roles: plain hacker
- website: http://vargolici.com
- occupation: sysadmin
- yob: 1984
- location: Bucure\u0219ti, România
- languages: Romanian, English
- interests: truth, freedom, knowledge, christianity
- favorite_distros: Parabola
diff --git a/users/1022.yml b/users/1022.yml
deleted file mode 100644
index d179214..0000000
--- a/users/1022.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-username: xihh
-fullname: Joshua Ismael Haase Hernández
-email:
-- hahj87@gmail.com
-groups:
-- hackers
-pgp_keyid: 8BD5A323D71FE444D5FDA1FF24BE374E7B44ABF9
-ssh_keys:
- hahj87@gmail.com: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCvIY4Osf0O6357R6YF9/g8rUat3T91y+17GUVjfE0mGPN77GQeliHy9c5aQYLwn9Yx0FO9SNJ2kE54nqaDcSS66WMWAG9c+LMcGRXVaZ/+g+psnLnSVvNth18n8QkQZ6M6Z4hx6n+nd1nSzlr8wg9MSuBQtiA5/tXHvjokl/6iCA+v5E2cvBG6iaGsa9ol/7gM+BedqMSPPEvgXJ5yxJpSN2jszoUZOklRp5wpzESxuTFAAngFJfWft08zSzXdvlD4lKBUuZTuLVG7SZt1vcZl7reuIAjMPDKwgdNbsKuyiJSRfaqpVYKh8Q7HnQ3WhCyvsODKEzWlCJRMzPY3Uuip
-shell: "/bin/bash"
-extra:
- other_contact: 'IRC: xihh'
- roles: Parabola Hacker, repo-maintainer.py, Package Monkey
- occupation: Student
- yob: 1989
- location: México
- languages: Spanish, English
- interests: Free Culture, Free Software, Synthetic Biology
- favorite_distros: Parabola, Trisquel
diff --git a/users/1023.yml b/users/1023.yml
deleted file mode 100644
index 055bd96..0000000
--- a/users/1023.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-username: xylon
-fullname: Joseph Graham
-email:
-- joseph.graham@gmx.com
-groups:
-- hackers
-pgp_keyid: 5519848081FC9E63F5F28659F6A3F50DFEFB7F29
-ssh_keys:
- joseph@t67.eu: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDCu98z9aiuZdg7k1cApVMroFqbjXuXadiD3UrKjNULFKARJqDZ/N7SXF8T1/UdQw1j5oqjDas9EifdeiFjEvgnFYDSrffSNNIx11QKcyBYzsECin3P9968/vpkt11Iu9o5inbYUz6Kqm+cFCh/7CQWUnt9Xk6yYOL5Cuk+0NpybqMTW8XBYRoGH4vgrG0iMb4PjAwFfEvMN5UVrxHtvohHm1RYhvInklYMPfb6+Kxps1Lkqazmyod5FG/Yz7yB+wUqhV3cLYcsnPKzJo7fMOjC27omQRXpIaYhi7HDB2rASatD25dXsTNqo9DT5jgKWW6VEJBRCPsksltZTNpbRcENRpuyfkyXIoGXulr49hOhwLJ7fnI3GLVYuTzMDFay3OA8a/tjqnHuYATcyW7BdiZgMdVC3SR7foQ8qhqTcwlMoqLycBT/0UMOtet9DF7gNbLISt7QiaHJMYNP5sIL8HMaTD91iqi+CYjrIcZiPbH7YnWwghNGu4NeySpGLzif3KMRdCLGcIMA/eNIw3QKdjYzAbnD7ORodHSs96+0JGe3pmKg+5BfA7s1bNNMBDCUO9GYvy3qxgECg90PNxGGHTEubwDFzgcEMi2L05+OajjKlxHQqawMoJIgBd7OPZeBzNMWAAE/QSboVjqwZF0oYgPawXrLVH/FGWb0yk5UjaB8Pw==
-shell: "/bin/bash"
-extra:
- other_contact: Freenode:Xylon
- roles: bot maintainer, pacman2pacman maintainer
- website: https://www.t67.eu
- occupation: mechanic
- yob: 1991
- location: West Sussex, England
- languages: English
- interests: programming, free software, motorcycles, electronics, martial arts
- favorite_distros: Parabola, Debian. BTW sorry about the ugliness of the other people
- on here
diff --git a/users/1024.yml b/users/1024.yml
deleted file mode 100644
index 5b3b364..0000000
--- a/users/1024.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-username: zenhack
-fullname: Ian Denhardt
-email:
-- ian@zenhack.net
-groups:
-- fellows
-shell: "/bin/bash"
-extra:
- alias: wobsite, zenhack
- other_contact: 'IRC : wobsite, Jabber : ian@zenhack.net'
- roles: Parabola Hacker, Mips port
- website: http://zenhack.net
- occupation: Student
- yob: 1987
- location: Boston, MA, USA
- languages: English, (a little) German
- interests: Intellectual freedom, Computer Science, Minimalism
- favorite_distros: Arch/Parabola
diff --git a/users/1025.yml b/users/1025.yml
deleted file mode 100644
index ed8ddc5..0000000
--- a/users/1025.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-username: gravi
-fullname: Gravi
-pgp_keyid: C8F5A53EC56BE3E1732C443BBFD443CAB6BE8B16
-ssh_keys:
- themightygravi@inventati.org: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCdbelqjZ1nmWcl2//uTuDQ1hUy+LJ87d2++NPfJV/AVt11GOCt3RlqjWClfxUh1sP7ybUmeyQAoiV1e1l2qzv+WTETznnNSfBA0NkIMkkIiB2bdF8S/OdsVMyOFSDf4DcpHzqkoz58a9jIPkUcZUFKaPbZHS2U5Xqup2oNoBXcDGkm+oLGEMTRyCkJdicHC+SWAUIu5gUl7jH2nXFQCDp/U7eQXMGG7T30LViGlAiHFkRC9kc3iP9QoCS5wjtVPLP8rK75Ub/Gv+04CC+JHlK0d6Skl5T4prw7wKiPV37cuCXC69ECTDb4KsPb17QTc3kR44HC+kv9+VJU9+yZx/ZZ
-shell: "/bin/bash"
diff --git a/users/1026.yml b/users/1026.yml
deleted file mode 100644
index 1b4d954..0000000
--- a/users/1026.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-username: freaj
-fullname: freaj
-email:
-- freaj@riseup.net
-groups:
-- hackers
-pgp_keyid: 6A02EFFEEE2464AD376E05A81A677766EBE25A09
-ssh_keys:
- freaj@riseup.net: ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAHFfZcJFNRqjbPSCRvcjaK6x8sba0RY3uOxFzNrgSNEreWzVNW4yq+tDi+x0WKCQs89vEnUNdbx3sAPzeLguIjfjwD8zRJD8SkrHFyaskBAW/xxoqwD23k0njU9HYAKa4aP5dfJJLHoQYl7R/motZLwnrfTJTlEi7kEbuVUGUHU3RY4Cw==
-shell: "/bin/bash"
-extra:
- other_contact: freaj@riseup.net for XMPP, freaj on freenode
- roles: Parabola Hacker, Package Monkey
- yob: 1995
- location: Paris, France
- languages: French and English
- favorite_distros: Parabola GNU/Linux-libre
diff --git a/users/1027.yml b/users/1027.yml
deleted file mode 100644
index 2e51c6d..0000000
--- a/users/1027.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-username: crazytoon
-fullname: crazytoon
-email:
-- crazytoon@riseup.net
-groups:
-- hackers
-pgp_keyid: 8BD8FE1B1E0759CEE30D50752CEFD6C5462F5D11
-shell: "/bin/bash"
-extra:
- roles: Cartoonist
- occupation: Cartoonist and animator
- yob: 1957
- location: São Paulo-SP, Brazil
- languages: Portuguese and Spanish
- interests: Ecology, free software, cartoon, cinematography, free art and 3D sculpture
- favorite_distros: Parabola, Trisquel and gNewSense
diff --git a/users/1028.yml b/users/1028.yml
deleted file mode 100644
index d89f4fc..0000000
--- a/users/1028.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-username: gaming4jc
-fullname: Luke R.
-email:
-- g4jc@openmailbox.org
-groups:
-- hackers
-pgp_keyid: CB6E213A349B8DF9E96B622AC3F4FFCF3EAE8697
-ssh_keys:
- g4jc@openmailbox.org: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQDanLR31uCWMPTL7hoFToB0XRRgrM+yQaYxZXg59XlNkMFlIj/JoRlaKh5Xc6WCLaVWv0CTTxhBnec+TVILAuAAeLSNfEJ88bggyKzA6Q20E1tXQA47yfpc/9OM6JHAyKuXqCoHP55a0+Web3tmhVGTIikyA3RIlZdoK0jZNlJdiUS1y6iQzGCUMCzYz1lBk15d15U7ZP3C+FyBncl1znvo8v6R5Kza7lAF4Gc7tfVRtY6FkVPxaJIqpz+QA6XNRYUDsF+cFBEw4Zru7V0qSLTwOxAo+xv5IQlLpJaLzBbTpdUFOcXIAmSbLQPup3PS5jqdq5QGAjAKX651AZsLg+oynzlRNZTIvHRglPYKYAYQcnD3u1106nfHBgo3WUKkdOs1Ie2UGqG5EPbo5EzWMiagEVXEcFLn5879Al9doS35ofECyqamLsdxoV3QaxBGBVKD2bLgHL6BnRhijGBKmgU6E/lYPywFy7EV3L1ln87O7DVyju7kchrDY+w2kzWKFmAXfG9Dea+MxSEtzXluOrmi36a3hJElUlalWdsXKRk9aZmZhbFisor24G6LjYctW4/bCExMK0mnEMPRuykwpQ4PXFh9dZDfRO15PXnVQ3TxXzBgKhK9SPc6ev9Zr3UBKbf1HKmZHQcKOBlzslahxNZClIBmWNUIcuE8V8I1cDgqNqMfoS0aCIfW6KLKDPnEBE/CTOoMHI7qXGwBS4mSK2L57UJZladAZBopXhKvTa5mXM9p/Z0DV6Q6P0kwadyQidVVu8j7O0FiuB6hf3yZCaYftFWvdtaDSZoBxjWhvmWxUsL+IKZ1AeBFAJiT/oIfnwqWYk2mZKgPwYsNUoNRYYQ3IIbTI4TZdHwDW5JdFr9XHKWVjQrmxnxrRFneXDC1W0TlL0lOnuA/VNUeMjfBreq892HFHKcVF9IrNpqqqqsdmwyIFncftHu3AlXN2Cp1YYEPs9H+G34Czkw5MlsdcfmWomJo0s+02Hqkz1GeTK5EjyfOv0wDIfG/Oyp4SQwJ9UyPXho5Ux+TYaNKwe9Jyf3SRStsgk7fZ6H+OIi+ZrRAZCCuUx/Ldq8flSdoMtinNObySEUvmHAVfeXY8AlQrXwB7C+zaepc81e4RrZocMPNrc8dB1mXQxOpnT2iE61VX8lkG2eIOEvwvffY8MDFcTA9jrw38IQTo4XYdQ0UPpYtvH0NGOhm4LRsdL/3oYIHPwAo+ftnqVqDViLYYk8ddjat3veBhPNDr1X8CW0JymH9LgM1w5OcBgS769lXitZwy2WO39OsYfj9LsXuZLGB68y7QsinymaGfTNQ6KMkEKFxFfooLJhjX4G0z6SYOX9APS3lVjjzUqG9cxs83pAoomv7
-shell: "/bin/bash"
-extra:
- other_contact: XMPP:g4jc@dukgo.com | Freenode:Gaming4JC | quitter.se:Gaming4JC
- roles: Parabola Hacker
- occupation: GNU Sysadmin/Graphics Design
- yob: 1992
- location: East Coast, USA
- languages: English
- interests: Christianity, Free Software/Free Culture, Computer Security, Gaming
- favorite_distros: Parabola and Trisquel
diff --git a/users/1029.yml b/users/1029.yml
deleted file mode 100644
index dd32114..0000000
--- a/users/1029.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-username: isacdaavid
-fullname: Isaac David
-email:
-- isacdaavid@isacdaavid.info
-groups:
-- hackers
-pgp_keyid: 38D33EF29A7691134357648733466E12EC7BA943
-ssh_keys:
- isacdaavid@isacdaavid.info: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC7V0BrMV/w9dPITsrK6Qa/3WxFb/CotqnEqMEBXg/E8Un8K7AQwdYA5dMeUsPYBzcAO7zY+VhZR1SvCmjJF8seMwItoBStI7ipvMcgtGr4NbGW4dq0nih1NeVzTQpEnmNPEQuZtb7LytAbftOEV3FmvfC43xkgLzw4sY8y7fDlzrsQxZuvCopDnYYFKFqFaO3zRQ+9ik2uxzSm6132j0cv440SLSriXDo31qVIQ8NfoslEnilFcBqVXkeQZ+i13XbANcTOtPOZ05J/a+5bpVxBLylqoeic24FwYHUkfTFP65YgX2sUcjaDzofPrt1ZVW8/OgSXbsCIDsr3PwN1hhxwKHyJ+xap8nFEheQXMPCX+i/62sGnH579WoJ9Fv5FXM0j0kUzOMHoFia3nLEiFQrxVWRVlAs0fPFxfg6kWsurHAE5ZVyb2KgyQsP/YOfxOaRZBRr80sNI/nVtsmtbTcu1WA+sgDUJDDen1f5WSZ+uBDx+Mz+MS22KklQAMuKjGsSHJ3QRJS2njHtmOGov0EDNAm8ive6sFWAtPKwN9Qs3Raa2tM27/jKEEFpQpUjwvK9/9Glo5c8tsev3U9DOZaNfnBKK3dyrDlMUxetDWKAZa6eXmi+L2GQ9a/Hd+reR76KInhcKVA9qe70lviTxLhneOW+zYEIOVcdp3CFJY9Y+Qw==
-shell: "/bin/bash"
-extra:
- other_contact: isacdaavid anywhere else
- roles: ARM package monkey, more to come
- website: https://isacdaavid.info
- occupation: Computer engineering student
- yob: 1993
- location: Mexico
- languages: Spanish (Castilian), English, French
- interests: science, math, art, music, computers, free as in freedom {software,knowledge,culture}
- favorite_distros: https://gnu.org/distros/free-distros.html
diff --git a/users/1030.yml b/users/1030.yml
deleted file mode 100644
index ae2d5c3..0000000
--- a/users/1030.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-username: pizzaiolo
-fullname: Nicolas Roma Pedro Maia
-email:
-- nicolasmaia@tutanota.com
-groups:
-- hackers
-pgp_keyid: EBDF658E5A72B7B8BD5FB0F46DB12E6B3CE04A86
-ssh_keys:
- pizzaiolo@tutanota.com: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC5w95yKFsG2Ev9jZzcwGIwBDY2S2j93WboshmFeqY7o00+fyTtXmea7gdfz+/mDLa8ZZ1DZVJDTTe4KvqoTVssRSj/GzOoj4Dz7cTFg/xroeUKxr5b6c1vMWeJtdHs4YATIqJyCglw1rDSEp8vhxAFRcIDnlN/m898uF8Mygl4AhSI/SkS5w82RG98pxjEVHP5ATVfJLXkvF0hFmSDgWusVOuSySrkjcJO9xpGDgE67lFLoxfSb7ZK1a/fWNXzcRAe/tjETZegXoyiUL9thtFP1Sc7e9u6PnzFYkFdJC2U1yiSV8zlAisvnz3rIP7Fj7qzXdAclvRPpyuw7zXxyfnxCeCIKCR9x08xXkUiFYC00GmeUKy0AUHLxh73cq77R/w9g0eBILsfDQ5pk2qmW3JoZA2kepMcJRvQ0i1WSA7fXMaS1usz+FuokwxyLRe//ZCa/i0sUcsCLUBXNuT5oOgoGBbrwhkpiuscGq+b9lyTaYV0maDkeE+nZ9NhXojKU7XvWd7rQv0EakT1RU1kvn/PP/1cUGrxGs9MlbyPUH+PklqvAXfU4uigFGUaYohGdHOqRrcexkUVsANG4vVDBoqtYiigjQfJm3QAxpZyC29BaH2Y+yeCEwJrqriJjOHz+Bni29G3SBJXqEQ8lbjz9rz1pIRRg0Smc1OfF2qsdSlVFw==
-shell: "/bin/bash"
-extra:
- other_contact: XMPP:nicolasmaia@diasporabr.com.br | Freenode:pizzaiolo | quitter.se:nicolasmaia
- roles: Parabola Hacker
- yob: 1991
- location: Rio de Janeiro-RJ, Brazil
- languages: Portuguese, Spanish, English and Esperanto
- interests: Free software, veganism, Esperanto and copyleft
- favorite_distros: Parabola GNU/Linux-libre, Trisquel
diff --git a/users/1031.yml b/users/1031.yml
deleted file mode 100644
index 74e3906..0000000
--- a/users/1031.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-username: ebrasca
-fullname: Bruno Cichoń
-email:
-- ebrasca.ebrasca@openmailbox.org
-- ebrasca.ebrasca@gmail.com
-groups:
-- hackers
-pgp_keyid: C90B027951EB38B7FA25E2E73052D5B24E10CAF9
-ssh_keys:
- ebrasca.ebrasca@openmailbox.org: ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAA2QERrbC7hxtUTsfPFWblDLUANNz+GBY08qIxePHvNGxfttZJez+Hlsf/NoxViKLfHSq/mLfOLa8D6KDTtg/hRxgHBQX9rgD/jT/Pmbz6pMAQgavIQm0HDS04O4AR6DQykdPcmIloLSgleHKlP7LKPeeNxg6aSqDrs0yYd43JZqNQaYg==
-shell: "/bin/bash"
-extra:
- other_contact: Freenode:Ebrasca | tox:5E042B7F400F8D05C0B4A9D688A6C026F6505B742F0A9A695D61FB814576F35AB506CC7CE862
- yob: 1994
- location: Poland
- languages: Spanish, English
- interests: Freedom, free software, procedural content generation, common lisp programming
- (sbcl), maths
- favorite_distros: Parabola GNU/Linux-libre
diff --git a/users/1100.yml b/users/1100.yml
deleted file mode 100644
index e4ec5a0..0000000
--- a/users/1100.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-username: autobuilder
-fullname: Parabola automatic package builder
-email:
-- autobuilder@parabolagnulinux.org
-groups:
-- bots
-pgp_keyid: D3EAD7F9D076EB9AF650149DA170D6A0B669E21A
-ssh_keys:
- autobuilder@parabolagnulinux.org: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCczzDgnLJVQkNJlkz4Y864qIDNXegvUPoMKjyiAEEg5FOaHJfrfU7HVTiUTQlm3pwrCKP/NEv13vy1TMl5FNXpIaCdivqusW4qOCEyWpbaNMaz28Gph92z2PHL21nt+h9WYCYi2zK8VBQyX1Vs6R2k9+tD1zjPxMRRxy54vo8OqXP9agLsxEGYWUWoWWiUTyiXp3h3oSWyta9BGdL6CI7xSlT4pX4JaTDMvMY5jL/n121PtySYjz0vYXsqGc7NDhCmkBKvv5ocQvMP7XwHX2bc+0johv7Bm3Ksqrm9Xp52rLGilpwyO+80gyfmzgGPkDzD3O+TaL6+oJSwixg1vOq7
-shell: "/usr/bin/nologin"