From 086eec72d86dddf1a378c4c18e68c17c69d0ab48 Mon Sep 17 00:00:00 2001 From: jeff Date: Tue, 27 Oct 2015 10:02:34 -0400 Subject: [PATCH] add "root trust" keys --- contrib/tools/keys/keys.sh | 10 ++++++++++ contrib/tools/keys/keys.sql | 10 ++++++++++ contrib/tools/keys/keys.txt | 10 ++++++++++ contrib/tools/thumbs.sh | 23 ----------------------- 4 files changed, 30 insertions(+), 23 deletions(-) create mode 100755 contrib/tools/keys/keys.sh create mode 100644 contrib/tools/keys/keys.sql create mode 100644 contrib/tools/keys/keys.txt delete mode 100755 contrib/tools/thumbs.sh diff --git a/contrib/tools/keys/keys.sh b/contrib/tools/keys/keys.sh new file mode 100755 index 0000000..c5b6b9a --- /dev/null +++ b/contrib/tools/keys/keys.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# +# script to make sql file for inserting all "currently trusted" keys +# + +root=$(readlink -e $(dirname $0)) +touch $root/keys.sql +for key in $(cat $root/keys.txt) ; do + echo "insert into modprivs(pubkey, newsgroup, permission) values('$key', 'overchan', 'all');" >> keys.sql ; +done diff --git a/contrib/tools/keys/keys.sql b/contrib/tools/keys/keys.sql new file mode 100644 index 0000000..d180fd6 --- /dev/null +++ b/contrib/tools/keys/keys.sql @@ -0,0 +1,10 @@ +insert into modprivs(pubkey, newsgroup, permission) values('039a876792db66966241e63140e7df79df488033360064b67d890635814e925e', 'overchan', 'all'); +insert into modprivs(pubkey, newsgroup, permission) values('286650cac49fc540507a2b6593fa7aba7c5101e4314b6e5cfee1e64810a85bb7', 'overchan', 'all'); +insert into modprivs(pubkey, newsgroup, permission) values('c85aed0939fa1677bf9f354d8ac3dc9b1132cabea22b152247fa59cfc3d42d4f', 'overchan', 'all'); +insert into modprivs(pubkey, newsgroup, permission) values('fcd5fdffdb742a696a6d4df3a06d5c180aa523f2900b13fe893556832a1171f4', 'overchan', 'all'); +insert into modprivs(pubkey, newsgroup, permission) values('7227245429c46262baabfc3ce8e27b584b22262ad5c074bac4f05e0c7e2d9106', 'overchan', 'all'); +insert into modprivs(pubkey, newsgroup, permission) values('0c701740b6f6e799fb08354150265e19553535d2bd168f55067134d4a61449ac', 'overchan', 'all'); +insert into modprivs(pubkey, newsgroup, permission) values('ce39e0ea3c056e02e086063296c12fd36b8bf9530ab694bc645b48684004f946', 'overchan', 'all'); +insert into modprivs(pubkey, newsgroup, permission) values('d03da6ab445729f5f38f478fbefc5226bb1d58393a3b5a6852ec89c3ababc314', 'overchan', 'all'); +insert into modprivs(pubkey, newsgroup, permission) values('ce39e0ea3c056e02e086063296c12fd36b8bf9530ab694bc645b48684004f946', 'overchan', 'all'); +insert into modprivs(pubkey, newsgroup, permission) values('6440e2e383a802f2d487c71d2018b9dc53529e5d234e668c156aec97dae8fe6b', 'overchan', 'all'); diff --git a/contrib/tools/keys/keys.txt b/contrib/tools/keys/keys.txt new file mode 100644 index 0000000..fe244ed --- /dev/null +++ b/contrib/tools/keys/keys.txt @@ -0,0 +1,10 @@ +039a876792db66966241e63140e7df79df488033360064b67d890635814e925e +286650cac49fc540507a2b6593fa7aba7c5101e4314b6e5cfee1e64810a85bb7 +c85aed0939fa1677bf9f354d8ac3dc9b1132cabea22b152247fa59cfc3d42d4f +fcd5fdffdb742a696a6d4df3a06d5c180aa523f2900b13fe893556832a1171f4 +7227245429c46262baabfc3ce8e27b584b22262ad5c074bac4f05e0c7e2d9106 +0c701740b6f6e799fb08354150265e19553535d2bd168f55067134d4a61449ac +ce39e0ea3c056e02e086063296c12fd36b8bf9530ab694bc645b48684004f946 +d03da6ab445729f5f38f478fbefc5226bb1d58393a3b5a6852ec89c3ababc314 +ce39e0ea3c056e02e086063296c12fd36b8bf9530ab694bc645b48684004f946 +6440e2e383a802f2d487c71d2018b9dc53529e5d234e668c156aec97dae8fe6b diff --git a/contrib/tools/thumbs.sh b/contrib/tools/thumbs.sh deleted file mode 100755 index 1d2c89e..0000000 --- a/contrib/tools/thumbs.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash -# -# shell script for regenerating thumbnails -# - -if [ "$1" == "" ] ; then - echo "usage: $0 webroot_dir" -else - cd $1/img - echo "regenerate missing thumbs in $(pwd)" - find . \ - -type f \ - -regextype posix-extended \ - -iregex '.*\.(png|jpg|gif)$' \ - -not -execdir test -f '../thm/{}' \; \ - -exec echo 'generating missing thumb for {}' \; \ - -exec mogrify \ - -define jpeg:size=500x500 \ - -thumbnail '250>x250>' \ - -path '../thm/{}.jpg' \ - -strip \ - '{}' \; -fi