From 0291bdff975089edac8ab1bc602d4034fa822325 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 1 Sep 2022 21:32:29 +0900 Subject: [PATCH 01/99] Use no-padding flag for `Time#strftime` --- bin/update-version.h.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/update-version.h.rb b/bin/update-version.h.rb index ba1206e5..cf29aa4e 100755 --- a/bin/update-version.h.rb +++ b/bin/update-version.h.rb @@ -79,8 +79,8 @@ def directory_path?(path) 'TIME' => [/".+"/, '"%H:%M:%S"'], 'CODE' => [/\d+/, '%Y%m%d'], 'YEAR' => [/\d+/, '%Y'], - 'MONTH' => [/\d+/, '%m'], - 'DAY' => [/\d+/, '%d'] + 'MONTH' => [/\d+/, '%-m'], + 'DAY' => [/\d+/, '%-d'] } now = Time.now @@ -97,7 +97,7 @@ def directory_path?(path) if /RUBY_RELEASE_(#{formats.keys.join('|')})/o =~ line format = formats[$1] line.sub!(format[0]) do - now.strftime(format[1]).sub(/^0/, '') + now.strftime(format[1]) end end fnew.puts line.rstrip From 6b98dbe396952330215a1f8d8f99b64f9d65511e Mon Sep 17 00:00:00 2001 From: Kevin Newton Date: Wed, 28 Jun 2023 10:24:40 -0400 Subject: [PATCH 02/99] Add kddnewton --- config/email.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/email.yml b/config/email.yml index a1e10d5f..2b8b11fd 100644 --- a/config/email.yml +++ b/config/email.yml @@ -74,6 +74,8 @@ jhawthorn: - john@hawthorn.email - jhawthorn@ruby-lang.org # jim +kddnewton: + - kddnewton@gmail.com k0kubun: - takashikkbn@gmail.com # kanemoto From 67537ddf5cc664f2bb03ffaf246d4e07df272fff Mon Sep 17 00:00:00 2001 From: Kevin Newton Date: Wed, 28 Jun 2023 10:27:58 -0400 Subject: [PATCH 03/99] Add kddnewton --- recipes/files/var/git/.ssh/authorized_keys | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/files/var/git/.ssh/authorized_keys b/recipes/files/var/git/.ssh/authorized_keys index 22a105fb..721499cb 100644 --- a/recipes/files/var/git/.ssh/authorized_keys +++ b/recipes/files/var/git/.ssh/authorized_keys @@ -27,6 +27,7 @@ environment="SVN_ACCOUNT_NAME=k0kubun" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDX0 environment="SVN_ACCOUNT_NAME=kanemoto" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAt1/3mzBCtD2v1sIqBxvvqPOefd6jvUrEDzDYoXgW5tRieV+UmdQC+HZGeNURzl6CwiwLR6wHziyOyREsJtsMtdHiAk7A0pbaOVT9sLAc01gHYB3k6eXxt7ybB+BdOsHgEtgJUvI8JTF+E26IlfM44GYJbhlL4aEcFEdZPXkolLLWY5+qXe2rizPz/bt9vnc4b720AfQC74JrtRalbCGPawLcV7y4smLE+kRjmzS5o5rbBe6kgyZ2n9X6IguPz+Fzy6YLzEiRL7uD834WK4rD5vXPQTSiXiO3apGZSu9q+MDi4cGTp2eXzyFsTHOFebKGfjCUfcDqgrtjfCTj3f5pXw== kanemoto@miggy kanemoto environment="SVN_ACCOUNT_NAME=katei" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIezAMzVD8CSCNQR1mnvyWxg8AcHn3wJ2Yoj9YPhHl6t environment="SVN_ACCOUNT_NAME=kazu" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILpK0tF51R1sMBfYpLNNogDQEVuM1twtKPlH93EI/q+/ kazu@elk kazu +environment="SVN_ACCOUNT_NAME=kddnewton" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPQjbEaL2YCM6YTlExHKVCzVNqTkVkOBtfe91yxs9hsi kddnewton@gmail.com environment="SVN_ACCOUNT_NAME=keiju" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDYvH6am51Z2FGccAc4sEGkN7OpNQhtb6/91bxBRgLyShHxmYUxH24oSycDv7CIoKzIxQih08o92FUxmrIK4LmhULW7vZNm83cMS7bIaZNPYVURaLzz7xKmUc49o6HZFAsMPPg3OFvdPVT+QEpAFujZ00X9sPK6zpsd/xnhj6qyAXfw0oZqNtXpTz50aSZTPn8D+GAWZb4fbZ+danOJZpUN7YwELvybpinbFj+nOxJKFrjZ+mRLhiABuiJ26oNA7kOKE3tMdPjii9qDnFpUjDkDxGYjxryU207oT90iizKd/2joVi69NuOTY6mTDf1hlqOTlRqBORw7va1remBRy9BvEL+T+dikJHu6B8qU++8pBUAGkT4tebfOveLdE5/+fasJ++/1H/M25fSMAbDNgsJS3EnTaw4A2XchFH6SC+6DluJHWMnm3Z1w7IOlEURzBpcVpYgALRjY+coijfz8TEIgSwiwUWLUSztXgILoO7eKXjGnOPHEeWl/HQFJlE3GosxpWj7dq8p8FQKodSdf5WXRk3m4tS2oy2r0odjURHqXQASdPxvrF+KF/FopwmWzazj23MDBP/zrOeU0oqyHjtTL8LExBuDcm3JnrSKdHxlWI2czZrpZW+pa50ykSC8f60KiJGnjSyR1Lz4kjwxuE9yLqSd4gTHr9iJk9+u3fhcgkQ== keiju@ishitsuka.com keiju environment="SVN_ACCOUNT_NAME=knu" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINNlg0z5+X9xuNP4jQczfNFv81OLuSP9nvQgtPvrmk7q knu@ruby-lang.org environment="SVN_ACCOUNT_NAME=ko1" ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAnmC8r8/DbTKflE/TU9KHOOTutlPkg9WFs7LDeJMOPpxX51r0wFgBUB5k5/lN7itozgEX4Hgz4lN0ao3FDOdSkLYtcG/u0nrr8fthra9tKiU09u9GmZAmqk+Vw0Ldj7JPX69b2jiHfF02ObQlgKerk3+XRVTXd7Ao02J9gDx97D7sJXXi/Cdy4T3h4T37zOR56p83E9VKFXg89tJbNLKoQiWEWX5cQdqcA+JgyyxcMdaGbmK41jxos2W6Ud0A69gXBhouvbBVrALEpSUb/5uvR+bk3uFNJ0AewfyPJpgIBPWtAPf00V2lxK0wbUJb9aN9i5rMuaal5KgoirpLREHKNw== for NaCl Servers ko1 From f2e91c6b41e6af1bc61e5acf04d2bb3d232fad80 Mon Sep 17 00:00:00 2001 From: Jemma Issroff Date: Wed, 28 Jun 2023 10:53:35 -0400 Subject: [PATCH 04/99] Add jemma email and ssh key --- config/email.yml | 2 ++ recipes/files/var/git/.ssh/authorized_keys | 1 + 2 files changed, 3 insertions(+) diff --git a/config/email.yml b/config/email.yml index a1e10d5f..ef8c03d6 100644 --- a/config/email.yml +++ b/config/email.yml @@ -68,6 +68,8 @@ hsbt: jaruga: - jaruga@ruby-lang.org # jeg2 +jemma: + - jemmaissroff@gmail.com jeremy: - code@jeremyevans.net jhawthorn: diff --git a/recipes/files/var/git/.ssh/authorized_keys b/recipes/files/var/git/.ssh/authorized_keys index 22a105fb..f0b95807 100644 --- a/recipes/files/var/git/.ssh/authorized_keys +++ b/recipes/files/var/git/.ssh/authorized_keys @@ -19,6 +19,7 @@ environment="SVN_ACCOUNT_NAME=headius" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0T4ml environment="SVN_ACCOUNT_NAME=hone" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0zVL7SWnhhN/gayRXUTvg30YNtDZACniAqgcq0xwmYgL6Mzh7lT8gY7wXWJyY9Kud40PaU1U9mB2WUjh9n1AgRCL/AZDDJrWUIvyMDkumxmi3PUvptHCmKYhXx7Ji2CKIQuRR5kRtKaPj+9GZVtk+52IKOTvQqcvUdWScp1zeXQ+tlwp1+K24Ge3TSdAGXaoOVUMWsQLY0oaO+WfNd+IFuHeQsSssh3rKSeHaFSCkPynQxce1TD75wAb/AmcX65d6FuwnyAjyvmEQPaEGp/KN0niDE79SVrTR65+cw9q10ApDN1AxN2FSt9EE04pHyTJ35vT+IXlM8rEoO0wi/R99w== hone@hone-laptop hone environment="SVN_ACCOUNT_NAME=hsbt" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK9soM0r82SN3fO4MVhPs9Q1OCYThuR9POvbhnP1HNph hsbt@euler environment="SVN_ACCOUNT_NAME=jaruga" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDGFd9NkGTvgHAue9sy/HbO76m9pSnRm9UngCX98NBXTjZN1GyS4I+jF/uONIWiS0Iv4ruHTxlsleIg3j9meZBS95VhdLdV8yojLIwpog9cPBSlIo20lPy+cAeBb3zaVIYHbnn3oAVALoHsix91RorJSdANNTi98SNkrtz0l7OyH01B17EM+wg9RDyONY/wKQh/d9nu1iHrO8rjCJKyU29rJCOALH9mwohdVNHJhJj/VOoLZKvLgjGetPOuBJgk5F4uVtCYpiJS/Sq9qPVCAadN6bwXHFIodIz4ku5MYryhhOCV3V4u3YRIAzZSB1mF+VShIimK+o5qxmoD/0H/BlutELOqJuplY2ssUpzjKhZJeGeXeXk6Cg4j3Wsf3BJZYaDypzekSVn8TIEOYJzDtv1Dm3+ZOROJ/egbL4pQP+EoAO2aIAhMneRtMlpwSctRvK5C5bLJm1Z+6AfQY3fnfrzft3y0K7YJWHq8V5hUKn+r2RhzgBDKx1tcxoobmE31nQ1HiW80TpQlKpR4K1KnGKnkuQu4pe/YJKLW9vodQoMIGOJ51v0DOd6OB2VlZpn6RBHpN4oeLuEVsWinq/VcppCXeF0cqmvB3nTOCwn3oHOCQgN/UT3Np9Mh9CUWXE+wN1vqqBFEPscAXobYlp2IgF9dZ7tY2xuEdGY0qBouM7zlmQ== jaruga@localhost.localdomain +environment="SVN_ACCOUNT_NAME=jemma" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCzWMlqqr350ltszjfA9MtXYRnChJflxYPw3sSITBbgbrqGytzzWkIKadlYa2tHYGgbEmz1FqHIQoR9mW2QXCgBdI3awO8rsWxLc5af4Uweb+2Qo0+4BBJ9Ke+rYJuV4QGYy0jsK0r/aJhxQhvanOPSdGacXGqns2R9mSsIotFOUI+ToAVXxGeI1YeDcnEj/281rWXGFJcwpyXzH2h8199oWb5gbR6qFJZD4OkEbY+Ym1uwTwdwaV/jLoLo1VAnPq5y9Y8+AoahvPqwGX8R2bfAXFNgQ8J/owFIynuSR6Dtr57Rkn5sjV3vP5cmkfh5obdILzTylWAXZxzINRBq9/eloydjJgwpJWGJLPwSSVOew9us2G+Sjq+zvprjo+JTJum82FUnUi0dNoFQAFapBdpPkUBZZNgTkzrkZHuuon/wnDiLuUJFrAJVaZCOm98G6HoTqOXrv/9pG2tawhMU9qXQX1aAVIB7GpGjZuBPAspwYgnds8vQmaw8QZJvkDngjCk+Lef9A00ZjfHVtfnGPi+TVloOLk/hjgfcX7KRTSAM4gUtU8Tjlg2nr9gtAMTPDWeaRNa9u66qkq5/Eeh4dab2eL3V7lL5Y9gw0S3Kdx8yq77l1tYQlOQgpCw04UpYbY0U+edUU8Z9JZ3z9OukheCVz/pgvfimbYozFA0x9/631w== jemma environment="SVN_ACCOUNT_NAME=jeremy" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE1s0ie7GIiU3kIhB6Pb0LH5Ljdb3oqCLE9Je08M40c3 jeremy@speedstar.jeremyevans.local environment="SVN_ACCOUNT_NAME=jeremy" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAwcDSfizu8bfaJ9Z5h+375qCiuJ4bp2kf8shO2fhmwC4KFG2al398BpUjlsZVHEVDIUGU3rhM+GHEUGvBF14rke1aSR+rM6RHeXCoWHCAdy8tvm9PzuAUWsM97d6oEKIchm0rOaJ0GX95gVldc190NfzQQ+vIUthxjxuPWXtKzVpcJiZiF3AR7hST+u6oUltx64sdJ0aKc3xhWAG48n8CIrQlnQZ0bLZw4Jtz9y8jinL6uXHQ2I+3USyeg+OvDPqThL3uo1IYbKfMdPaxW8xR7a6dnPex3Kx8I0Ay/KRdMHEfbUeN0zclmbclqVUa/3qRKSbB5uod8lYkpK2sUisFZQ== jeremy@speedstar.jeremyevans.local environment="SVN_ACCOUNT_NAME=jhawthorn" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ4FsiavriYpm9GKVP2TEztHxnzwiYRosx7fWI5LN3cl From 0d0a8235e912c3039af736659f152a6b90d79104 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 29 Jun 2023 08:28:46 +0900 Subject: [PATCH 05/99] Update bundles and bundler version --- Gemfile.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 87837ad9..30870aca 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,7 +5,7 @@ GEM bcrypt_pbkdf (1.1.0) ed25519 (1.3.0) hashie (5.0.0) - hocho (0.3.7) + hocho (0.3.8) hashie itamae net-ssh (>= 4.1.0) @@ -16,22 +16,22 @@ GEM schash (~> 0.1.0) specinfra (>= 2.64.0, < 3.0.0) thor (>= 1.0.0) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-ssh (7.0.1) + net-scp (4.0.0) + net-ssh (>= 2.6.5, < 8.0.0) + net-ssh (7.1.0) net-telnet (0.1.1) - power_assert (2.0.2) + power_assert (2.0.3) rake (13.0.6) schash (0.1.2) sfl (2.3) - specinfra (2.83.3) + specinfra (2.86.0) net-scp net-ssh (>= 2.7) net-telnet (= 0.1.1) sfl - test-unit (3.5.5) + test-unit (3.6.1) power_assert - thor (1.2.1) + thor (1.2.2) PLATFORMS ruby @@ -44,4 +44,4 @@ DEPENDENCIES test-unit BUNDLED WITH - 2.1.4 + 2.4.14 From 6878e74e8e2f35405fbd536507c795a8f75008f7 Mon Sep 17 00:00:00 2001 From: Jemma Issroff Date: Wed, 5 Jul 2023 16:24:51 -0400 Subject: [PATCH 06/99] Add script to slack for a failed cherry-pick while syncing --- bin/slack_failed_gem_update.rb | 19 +++++++++++++++++++ bin/update-default-gem.sh | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 bin/slack_failed_gem_update.rb diff --git a/bin/slack_failed_gem_update.rb b/bin/slack_failed_gem_update.rb new file mode 100644 index 00000000..2b85a04e --- /dev/null +++ b/bin/slack_failed_gem_update.rb @@ -0,0 +1,19 @@ +log_contents = File.read(ARGV[0]).split("### start ###").last + +payload = { + attachments: [{ + text: (log_contents || "") + }] +} + +URL = File.read(File.expand_path("~git/config/slack-webhook-alerts-sync")).chomp +uri = URI.parse(URL) +http = Net::HTTP.new(uri.host, uri.port) +http.use_ssl = true +result = http.start do + req = Net::HTTP::Post.new(uri.path) + req.set_form_data(payload: payload.to_json) + http.request(req) +end + +puts result.code diff --git a/bin/update-default-gem.sh b/bin/update-default-gem.sh index 6026b885..f298a139 100755 --- a/bin/update-default-gem.sh +++ b/bin/update-default-gem.sh @@ -37,6 +37,8 @@ if ruby -C "$ruby_workdir" tool/sync_default_gems.rb "$gem_name" "$before..$afte if ! SVN_ACCOUNT_NAME=git git -C "$ruby_workdir" push origin "HEAD:master" >> "$log_path" 2>&1; then log "Failed: git push" fi +else + ruby bin/slack_failed_gem_update.rb "$log_path" >> "$log_path" 2>&1 fi log "### end ###\n" From 5cb7b7c5ac29f99529a537dc26a419bcafbba480 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Wed, 5 Jul 2023 13:30:25 -0700 Subject: [PATCH 07/99] Add missing requires --- bin/slack_failed_gem_update.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/slack_failed_gem_update.rb b/bin/slack_failed_gem_update.rb index 2b85a04e..c9a7b18b 100644 --- a/bin/slack_failed_gem_update.rb +++ b/bin/slack_failed_gem_update.rb @@ -1,3 +1,7 @@ +require 'uri' +require 'net/http' +require 'json' + log_contents = File.read(ARGV[0]).split("### start ###").last payload = { From e632a5ed0c9b71065409b2ec0d5866e3bc3681e3 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Wed, 5 Jul 2023 13:31:28 -0700 Subject: [PATCH 08/99] Use a full path for now --- bin/update-default-gem.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/update-default-gem.sh b/bin/update-default-gem.sh index f298a139..f10d91d6 100755 --- a/bin/update-default-gem.sh +++ b/bin/update-default-gem.sh @@ -38,7 +38,7 @@ if ruby -C "$ruby_workdir" tool/sync_default_gems.rb "$gem_name" "$before..$afte log "Failed: git push" fi else - ruby bin/slack_failed_gem_update.rb "$log_path" >> "$log_path" 2>&1 + ruby /home/git/git.ruby-lang.org/bin/slack_failed_gem_update.rb "$log_path" >> "$log_path" 2>&1 fi log "### end ###\n" From 62e06d5f45472cf7d6ae2d99f060249df13cbb9b Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Wed, 5 Jul 2023 13:42:30 -0700 Subject: [PATCH 09/99] Make the script names consistent --- ..._failed_gem_update.rb => notify-slack-failed-gem-update.rb} | 0 bin/update-default-gem.sh | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename bin/{slack_failed_gem_update.rb => notify-slack-failed-gem-update.rb} (100%) mode change 100644 => 100755 diff --git a/bin/slack_failed_gem_update.rb b/bin/notify-slack-failed-gem-update.rb old mode 100644 new mode 100755 similarity index 100% rename from bin/slack_failed_gem_update.rb rename to bin/notify-slack-failed-gem-update.rb diff --git a/bin/update-default-gem.sh b/bin/update-default-gem.sh index f10d91d6..1da7bc52 100755 --- a/bin/update-default-gem.sh +++ b/bin/update-default-gem.sh @@ -14,6 +14,7 @@ gem_user="$1" gem_name="$2" before="$3" after="$4" +this_repo="/home/git/git.ruby-lang.org" ruby_repo="/var/git/ruby.git" ruby_workdir="/data/git.ruby-lang.org/update-default-gem-${gem_name}" log_path="/tmp/update-default-gem-${gem_name}.log" @@ -38,7 +39,7 @@ if ruby -C "$ruby_workdir" tool/sync_default_gems.rb "$gem_name" "$before..$afte log "Failed: git push" fi else - ruby /home/git/git.ruby-lang.org/bin/slack_failed_gem_update.rb "$log_path" >> "$log_path" 2>&1 + "${this_repo}/bin/notify-slack-failed-gem-update.rb" "$log_path" >> "$log_path" 2>&1 fi log "### end ###\n" From aa84f8fe76132517de67358db0fe4a31458d4e2a Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Wed, 5 Jul 2023 13:43:18 -0700 Subject: [PATCH 10/99] Add a suffix for disambiguation --- bin/{notify-slack.rb => notify-slack-commits.rb} | 0 hooks/post-receive-pre.sh | 2 +- hooks/post-receive.sh | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename bin/{notify-slack.rb => notify-slack-commits.rb} (100%) diff --git a/bin/notify-slack.rb b/bin/notify-slack-commits.rb similarity index 100% rename from bin/notify-slack.rb rename to bin/notify-slack-commits.rb diff --git a/hooks/post-receive-pre.sh b/hooks/post-receive-pre.sh index 0fc4a3bf..5e34e0b0 100755 --- a/hooks/post-receive-pre.sh +++ b/hooks/post-receive-pre.sh @@ -19,7 +19,7 @@ log "args: $*" # git remote update; git push github # log "==> notify slack" -# "${ruby_commit_hook}/bin/notify-slack.rb" $* +# "${ruby_commit_hook}/bin/notify-slack-commits.rb" $* # log "==> commit-email.rb" # "${ruby_commit_hook}/bin/commit-email.rb" \ diff --git a/hooks/post-receive.sh b/hooks/post-receive.sh index df5a3c09..f1758f45 100755 --- a/hooks/post-receive.sh +++ b/hooks/post-receive.sh @@ -19,7 +19,7 @@ log "SVN_ACCOUNT_NAME: ${SVN_ACCOUNT_NAME:-}" log "args: $*" log "==> notify slack" -"${ruby_commit_hook}/bin/notify-slack.rb" $* +"${ruby_commit_hook}/bin/notify-slack-commits.rb" $* log "==> commit-email.rb" "${ruby_commit_hook}/bin/commit-email.rb" \ From 641f2f1b88c84c4f06ce2048443a0ae22afdc563 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Wed, 5 Jul 2023 13:45:35 -0700 Subject: [PATCH 11/99] Clarify what we're logging --- bin/notify-slack-failed-gem-update.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/notify-slack-failed-gem-update.rb b/bin/notify-slack-failed-gem-update.rb index c9a7b18b..27700c7e 100755 --- a/bin/notify-slack-failed-gem-update.rb +++ b/bin/notify-slack-failed-gem-update.rb @@ -20,4 +20,5 @@ http.request(req) end -puts result.code +puts "---" +puts "#{$0}: status #{result.code}" From fc26a7a41b3d781a489aafd5505ea2fe5b3c7b53 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Wed, 5 Jul 2023 13:48:03 -0700 Subject: [PATCH 12/99] Add a title to attachments --- bin/notify-slack-failed-gem-update.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/notify-slack-failed-gem-update.rb b/bin/notify-slack-failed-gem-update.rb index 27700c7e..3cb4bbd6 100755 --- a/bin/notify-slack-failed-gem-update.rb +++ b/bin/notify-slack-failed-gem-update.rb @@ -2,11 +2,13 @@ require 'net/http' require 'json' -log_contents = File.read(ARGV[0]).split("### start ###").last +log_path = ARGV[0] +log_contents = File.read(log_path).split("### start ###").last || "" payload = { attachments: [{ - text: (log_contents || "") + title: File.basename(log_path), + text: log_contents, }] } From f57ee9a078c4bad4b689a2fe3ac85f50960c295d Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Wed, 5 Jul 2023 13:49:26 -0700 Subject: [PATCH 13/99] Add a missing shebang --- bin/notify-slack-failed-gem-update.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/notify-slack-failed-gem-update.rb b/bin/notify-slack-failed-gem-update.rb index 3cb4bbd6..dbe46048 100755 --- a/bin/notify-slack-failed-gem-update.rb +++ b/bin/notify-slack-failed-gem-update.rb @@ -1,3 +1,5 @@ +#!/usr/bin/env ruby + require 'uri' require 'net/http' require 'json' From 3d8d5c38329c7877c08f2c9f50a80f99f5e2c263 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 15 Aug 2023 12:07:38 +0900 Subject: [PATCH 14/99] Empty files do not need a newline --- bin/auto-style.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/auto-style.rb b/bin/auto-style.rb index d99a0484..838c2b3d 100755 --- a/bin/auto-style.rb +++ b/bin/auto-style.rb @@ -184,7 +184,7 @@ def with_clean_env edited_files = files.select do |f| src = File.binread(f) rescue next - eofnewline = eofnewline0 = true if src.sub!(/(? Date: Thu, 17 Aug 2023 16:14:55 -0700 Subject: [PATCH 15/99] Carve out a git-user recipe --- recipes/cgit.rb | 5 ----- recipes/default.rb | 5 +---- recipes/git-user.rb | 8 ++++++++ 3 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 recipes/git-user.rb diff --git a/recipes/cgit.rb b/recipes/cgit.rb index e9118e77..ba651025 100644 --- a/recipes/cgit.rb +++ b/recipes/cgit.rb @@ -7,8 +7,3 @@ mode "644" owner "root" end - -remote_file "/var/git/.ssh/authorized_keys" do - mode "600" - owner "git" -end diff --git a/recipes/default.rb b/recipes/default.rb index 7380b9b4..db79fd84 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -6,10 +6,6 @@ package "gpg" package "rsync" -user "git" do - shell "/usr/bin/git-shell" -end - directory "/home/git" do owner "git" group "git" @@ -18,6 +14,7 @@ include_recipe 'apache2' include_recipe 'cgit' +include_recipe 'git-user' include_recipe 'git-sync-check' remote_file '/etc/sudoers' diff --git a/recipes/git-user.rb b/recipes/git-user.rb new file mode 100644 index 00000000..e77a1a06 --- /dev/null +++ b/recipes/git-user.rb @@ -0,0 +1,8 @@ +user "git" do + shell "/usr/bin/git-shell" +end + +remote_file "/var/git/.ssh/authorized_keys" do + mode "600" + owner "git" +end From a05d1ebeef94d971b7dcb3bdb23d6f9c38e8c24c Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Thu, 17 Aug 2023 16:18:59 -0700 Subject: [PATCH 16/99] Document git user's $HOME --- recipes/git-user.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/git-user.rb b/recipes/git-user.rb index e77a1a06..86dfe9f9 100644 --- a/recipes/git-user.rb +++ b/recipes/git-user.rb @@ -1,5 +1,6 @@ user "git" do shell "/usr/bin/git-shell" + home "/var/git" end remote_file "/var/git/.ssh/authorized_keys" do From d8debb3534672fddb643d1a6555708ab354c118d Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Thu, 17 Aug 2023 16:22:36 -0700 Subject: [PATCH 17/99] Manage /home/git under git-user recipe as well --- recipes/default.rb | 6 ------ recipes/git-user.rb | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/recipes/default.rb b/recipes/default.rb index db79fd84..f0622000 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -6,12 +6,6 @@ package "gpg" package "rsync" -directory "/home/git" do - owner "git" - group "git" - mode "0755" -end - include_recipe 'apache2' include_recipe 'cgit' include_recipe 'git-user' diff --git a/recipes/git-user.rb b/recipes/git-user.rb index 86dfe9f9..7e8494b2 100644 --- a/recipes/git-user.rb +++ b/recipes/git-user.rb @@ -3,6 +3,13 @@ home "/var/git" end +# We put files used by git here. However, this is NOT git's $HOME. +directory "/home/git" do + owner "git" + group "git" + mode "0755" +end + remote_file "/var/git/.ssh/authorized_keys" do mode "600" owner "git" From 266ede95d1a58b23bd6bc78fdc88871201b12de9 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Thu, 17 Aug 2023 16:25:18 -0700 Subject: [PATCH 18/99] Put ~git/.gitconfig under mitamae's control --- recipes/files/var/git/.gitconfig | 7 +++++++ recipes/git-user.rb | 5 +++++ 2 files changed, 12 insertions(+) create mode 100644 recipes/files/var/git/.gitconfig diff --git a/recipes/files/var/git/.gitconfig b/recipes/files/var/git/.gitconfig new file mode 100644 index 00000000..559b5972 --- /dev/null +++ b/recipes/files/var/git/.gitconfig @@ -0,0 +1,7 @@ +[user] + name = git + email = svn-admin@ruby-lang.org +[push] + default = matching +[pull] + rebase = true diff --git a/recipes/git-user.rb b/recipes/git-user.rb index 7e8494b2..7822aff6 100644 --- a/recipes/git-user.rb +++ b/recipes/git-user.rb @@ -14,3 +14,8 @@ mode "600" owner "git" end + +remote_file "/var/git/.gitconfig" do + mode "644" + owner "git" +end From b78ec84dbc8f2314f187f679269ec8f57ab04004 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Thu, 17 Aug 2023 16:26:34 -0700 Subject: [PATCH 19/99] I don't like hard tabs --- recipes/files/var/git/.gitconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/files/var/git/.gitconfig b/recipes/files/var/git/.gitconfig index 559b5972..d56220c8 100644 --- a/recipes/files/var/git/.gitconfig +++ b/recipes/files/var/git/.gitconfig @@ -1,7 +1,7 @@ [user] - name = git - email = svn-admin@ruby-lang.org + name = git + email = svn-admin@ruby-lang.org [push] - default = matching + default = matching [pull] - rebase = true + rebase = true From 5633644ae0038ca2ad67e2fa898287edb1064d92 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Thu, 17 Aug 2023 16:28:23 -0700 Subject: [PATCH 20/99] Disable merge.renameLimit entirely as per https://stackoverflow.com/a/13118734 --- recipes/files/var/git/.gitconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/files/var/git/.gitconfig b/recipes/files/var/git/.gitconfig index d56220c8..2d697f3c 100644 --- a/recipes/files/var/git/.gitconfig +++ b/recipes/files/var/git/.gitconfig @@ -5,3 +5,5 @@ default = matching [pull] rebase = true +[merge] + renameLimit = 0 From 6724d34604764b9d370b5da0da5ad87a0f1ad1ad Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Wed, 23 Aug 2023 14:06:36 -0700 Subject: [PATCH 21/99] Upgrade git version --- recipes/bullseye-backports.rb | 8 ++++++++ recipes/default.rb | 16 +++++++++------- .../apt/sources.list.d/bullseye-backports.list | 1 + 3 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 recipes/bullseye-backports.rb create mode 100644 recipes/files/etc/apt/sources.list.d/bullseye-backports.list diff --git a/recipes/bullseye-backports.rb b/recipes/bullseye-backports.rb new file mode 100644 index 00000000..b9e17eca --- /dev/null +++ b/recipes/bullseye-backports.rb @@ -0,0 +1,8 @@ +execute 'apt update' do + action :nothing +end + +# Use newer git (2.34.x instead of 2.30.x) +remote_file '/etc/apt/sources.list.d/bullseye-backports.list' do + notifies :run, 'execute[apt update]' +end diff --git a/recipes/default.rb b/recipes/default.rb index f0622000..ed702cf6 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -1,10 +1,12 @@ -package "cgit" -package "certbot" -package "git" -package "ruby" -package "postfix" -package "gpg" -package "rsync" +include_recipe 'bullseye-backports' + +package 'cgit' +package 'certbot' +package 'git' +package 'ruby' +package 'postfix' +package 'gpg' +package 'rsync' include_recipe 'apache2' include_recipe 'cgit' diff --git a/recipes/files/etc/apt/sources.list.d/bullseye-backports.list b/recipes/files/etc/apt/sources.list.d/bullseye-backports.list new file mode 100644 index 00000000..290785a1 --- /dev/null +++ b/recipes/files/etc/apt/sources.list.d/bullseye-backports.list @@ -0,0 +1 @@ +deb http://deb.debian.org/debian bullseye-backports main From b29ca9c180b24a57da5f58ca5bc7496cd44c9ec1 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Wed, 23 Aug 2023 14:11:02 -0700 Subject: [PATCH 22/99] Upgrade git from 2.30.2 to 2.39.2 --- recipes/bullseye-backports.rb | 2 +- recipes/default.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/bullseye-backports.rb b/recipes/bullseye-backports.rb index b9e17eca..198dac5f 100644 --- a/recipes/bullseye-backports.rb +++ b/recipes/bullseye-backports.rb @@ -2,7 +2,7 @@ action :nothing end -# Use newer git (2.34.x instead of 2.30.x) +# Use newer git: 2.34.x+ instead of 2.30.x remote_file '/etc/apt/sources.list.d/bullseye-backports.list' do notifies :run, 'execute[apt update]' end diff --git a/recipes/default.rb b/recipes/default.rb index ed702cf6..47be3b64 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -2,7 +2,7 @@ package 'cgit' package 'certbot' -package 'git' +package 'git/bullseye-backports' package 'ruby' package 'postfix' package 'gpg' From 3c27d860b4e39d10d63280b59d4db2cec518ae13 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Mon, 28 Aug 2023 01:13:52 -0700 Subject: [PATCH 23/99] Drop racc support from auto-sync --- cgi-bin/webhook.cgi | 1 - 1 file changed, 1 deletion(-) diff --git a/cgi-bin/webhook.cgi b/cgi-bin/webhook.cgi index b9db2648..ca2055b3 100755 --- a/cgi-bin/webhook.cgi +++ b/cgi-bin/webhook.cgi @@ -102,7 +102,6 @@ class PushHook prettyprint pstore psych - racc rdoc readline readline-ext From 3291bd0d04d162be6c6df596447cdb9043dd07aa Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 13 Sep 2023 15:51:18 +0900 Subject: [PATCH 24/99] Added openssl as auto-sync target --- cgi-bin/webhook.cgi | 1 + 1 file changed, 1 insertion(+) diff --git a/cgi-bin/webhook.cgi b/cgi-bin/webhook.cgi index ca2055b3..0549144c 100755 --- a/cgi-bin/webhook.cgi +++ b/cgi-bin/webhook.cgi @@ -95,6 +95,7 @@ class PushHook observer open-uri open3 + openssl optparse ostruct pathname From 826cbdd50c8b2c500792c33bfbed62e2917ade06 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Wed, 27 Sep 2023 11:01:15 -0700 Subject: [PATCH 25/99] Rename yarp to prism --- cgi-bin/webhook.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgi-bin/webhook.cgi b/cgi-bin/webhook.cgi index 0549144c..caae842a 100755 --- a/cgi-bin/webhook.cgi +++ b/cgi-bin/webhook.cgi @@ -101,6 +101,7 @@ class PushHook pathname pp prettyprint + prism pstore psych rdoc @@ -126,7 +127,6 @@ class PushHook weakref win32ole yaml - yarp zlib ].map { |repo| "ruby/#{repo}" } + %w[ rubygems/rubygems From 221f4ddfacc3f886db6e1084d72aef5e5128fd88 Mon Sep 17 00:00:00 2001 From: KJ Tsanaktsidis Date: Thu, 7 Dec 2023 21:21:25 +1100 Subject: [PATCH 26/99] Add kjtsanaktsidis's email & SSH keys --- config/email.yml | 3 +++ recipes/files/var/git/.ssh/authorized_keys | 2 ++ 2 files changed, 5 insertions(+) diff --git a/config/email.yml b/config/email.yml index b7cbcf7c..aa96015b 100644 --- a/config/email.yml +++ b/config/email.yml @@ -87,6 +87,9 @@ katei: kazu: - zn@mbf.nifty.com # keiju +kjtsanaktsidis: + - ktsanaktsidis@zendesk.com + - kj@kjtsanaktsidis.id.au knu: - knu@idaemons.org ko1: diff --git a/recipes/files/var/git/.ssh/authorized_keys b/recipes/files/var/git/.ssh/authorized_keys index 2daa1348..300db5d0 100644 --- a/recipes/files/var/git/.ssh/authorized_keys +++ b/recipes/files/var/git/.ssh/authorized_keys @@ -30,6 +30,8 @@ environment="SVN_ACCOUNT_NAME=katei" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIezAMz environment="SVN_ACCOUNT_NAME=kazu" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILpK0tF51R1sMBfYpLNNogDQEVuM1twtKPlH93EI/q+/ kazu@elk kazu environment="SVN_ACCOUNT_NAME=kddnewton" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPQjbEaL2YCM6YTlExHKVCzVNqTkVkOBtfe91yxs9hsi kddnewton@gmail.com environment="SVN_ACCOUNT_NAME=keiju" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDYvH6am51Z2FGccAc4sEGkN7OpNQhtb6/91bxBRgLyShHxmYUxH24oSycDv7CIoKzIxQih08o92FUxmrIK4LmhULW7vZNm83cMS7bIaZNPYVURaLzz7xKmUc49o6HZFAsMPPg3OFvdPVT+QEpAFujZ00X9sPK6zpsd/xnhj6qyAXfw0oZqNtXpTz50aSZTPn8D+GAWZb4fbZ+danOJZpUN7YwELvybpinbFj+nOxJKFrjZ+mRLhiABuiJ26oNA7kOKE3tMdPjii9qDnFpUjDkDxGYjxryU207oT90iizKd/2joVi69NuOTY6mTDf1hlqOTlRqBORw7va1remBRy9BvEL+T+dikJHu6B8qU++8pBUAGkT4tebfOveLdE5/+fasJ++/1H/M25fSMAbDNgsJS3EnTaw4A2XchFH6SC+6DluJHWMnm3Z1w7IOlEURzBpcVpYgALRjY+coijfz8TEIgSwiwUWLUSztXgILoO7eKXjGnOPHEeWl/HQFJlE3GosxpWj7dq8p8FQKodSdf5WXRk3m4tS2oy2r0odjURHqXQASdPxvrF+KF/FopwmWzazj23MDBP/zrOeU0oqyHjtTL8LExBuDcm3JnrSKdHxlWI2czZrpZW+pa50ykSC8f60KiJGnjSyR1Lz4kjwxuE9yLqSd4gTHr9iJk9+u3fhcgkQ== keiju@ishitsuka.com keiju +environment="SVN_ACCOUNT_NAME=kjtsanaktsidis" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMFmr90xpvG/6fJ1L1g+fg+2J7eZgOTcT3MTVvEfcvvx +environment="SVN_ACCOUNT_NAME=kjtsanaktsidis" ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBA+yrdwdfxsfBHyZbMhbPS5j2owyD3uNUMrQFbbNQOpiysKXAhCWfwOPuCsSZojKcsHXgc3CLk3tgPzO4cPUVNI= environment="SVN_ACCOUNT_NAME=knu" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINNlg0z5+X9xuNP4jQczfNFv81OLuSP9nvQgtPvrmk7q knu@ruby-lang.org environment="SVN_ACCOUNT_NAME=ko1" ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAnmC8r8/DbTKflE/TU9KHOOTutlPkg9WFs7LDeJMOPpxX51r0wFgBUB5k5/lN7itozgEX4Hgz4lN0ao3FDOdSkLYtcG/u0nrr8fthra9tKiU09u9GmZAmqk+Vw0Ldj7JPX69b2jiHfF02ObQlgKerk3+XRVTXd7Ao02J9gDx97D7sJXXi/Cdy4T3h4T37zOR56p83E9VKFXg89tJbNLKoQiWEWX5cQdqcA+JgyyxcMdaGbmK41jxos2W6Ud0A69gXBhouvbBVrALEpSUb/5uvR+bk3uFNJ0AewfyPJpgIBPWtAPf00V2lxK0wbUJb9aN9i5rMuaal5KgoirpLREHKNw== for NaCl Servers ko1 environment="SVN_ACCOUNT_NAME=kosaki" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMi26qZaTy6S5IUnZT+YXjKrPIkWNMrnMmwTIBROo7aK kosaki@vm-32cpu From f6c6d60b72239f20442b928457975683581979e4 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sat, 16 Dec 2023 09:59:11 +0800 Subject: [PATCH 27/99] Prepare to release Ruby 3.3.0 --- cgi-bin/webhook.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgi-bin/webhook.cgi b/cgi-bin/webhook.cgi index caae842a..0c01d394 100755 --- a/cgi-bin/webhook.cgi +++ b/cgi-bin/webhook.cgi @@ -132,7 +132,7 @@ class PushHook rubygems/rubygems ] # Set false to stop sync before a release - DEFAULT_GEM_SYNC_ENABLED = true + DEFAULT_GEM_SYNC_ENABLED = false def initialize(logger:) @logger = logger From c4aec0cf2f98e00585bd4a9fbdf7f3aa9d6b8b2a Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Mon, 25 Dec 2023 17:33:26 +0900 Subject: [PATCH 28/99] Restart auto-sync for default gems --- cgi-bin/webhook.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgi-bin/webhook.cgi b/cgi-bin/webhook.cgi index 0c01d394..caae842a 100755 --- a/cgi-bin/webhook.cgi +++ b/cgi-bin/webhook.cgi @@ -132,7 +132,7 @@ class PushHook rubygems/rubygems ] # Set false to stop sync before a release - DEFAULT_GEM_SYNC_ENABLED = false + DEFAULT_GEM_SYNC_ENABLED = true def initialize(logger:) @logger = logger From b5fc65a925a334bfa639440f7941b7121ff711c4 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 26 Dec 2023 14:03:43 -0800 Subject: [PATCH 29/99] Try Restart=always --- .../files/etc/systemd/system/apache2.service.d/override.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/files/etc/systemd/system/apache2.service.d/override.conf b/recipes/files/etc/systemd/system/apache2.service.d/override.conf index 9792c515..0d151d79 100644 --- a/recipes/files/etc/systemd/system/apache2.service.d/override.conf +++ b/recipes/files/etc/systemd/system/apache2.service.d/override.conf @@ -1,3 +1,3 @@ -# Override the default PrivateTmp=true [Service] PrivateTmp=false +Restart=always From 7f1d7dcf387cfc5dfd49a31d063735068c281574 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 26 Dec 2023 14:05:32 -0800 Subject: [PATCH 30/99] Use the default bundler on CI --- .github/workflows/test.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b0dc15e9..5f2d3da9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,9 +15,6 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: 2.7.4 - - name: Install dependencies - run: | - gem install bundler --no-document - bundle install + - name: bundle install - name: Run test run: bundle exec rake test From 77a4ea6174de1bd1ad949d3db8f0f30b813638e1 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 26 Dec 2023 14:07:07 -0800 Subject: [PATCH 31/99] Fix a wrong syntax --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5f2d3da9..885bf30f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,6 +15,6 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: 2.7.4 - - name: bundle install + - run: bundle install - name: Run test run: bundle exec rake test From ca2e395cd5fb5fffb8b94b642d3ac5d26aa4b31b Mon Sep 17 00:00:00 2001 From: m-nakamura145 Date: Wed, 17 Jan 2024 22:08:46 +0900 Subject: [PATCH 32/99] Update latest checkout action version --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 885bf30f..d5e1f18a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ jobs: name: Test runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: From 427e27d8b8c8e36547b7c2f5fb6cf785f2c19039 Mon Sep 17 00:00:00 2001 From: m-nakamura145 Date: Fri, 19 Jan 2024 08:47:20 +0900 Subject: [PATCH 33/99] Added dependabot for GitHub Actions --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..b18fd293 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: 'github-actions' + directory: '/' + schedule: + interval: 'weekly' From 512d4eec332fc32097808a7e0dcd4ad0f8d08b9b Mon Sep 17 00:00:00 2001 From: Ryan Davis Date: Thu, 14 Mar 2024 13:07:50 -0600 Subject: [PATCH 34/99] Add zenspider's email addresses and SSH key --- config/email.yml | 4 ++++ recipes/files/var/git/.ssh/authorized_keys | 1 + 2 files changed, 5 insertions(+) diff --git a/config/email.yml b/config/email.yml index aa96015b..364f7554 100644 --- a/config/email.yml +++ b/config/email.yml @@ -210,6 +210,10 @@ yui-knk: - yui-knk@ruby-lang.org yuki: - yk.nishijima@gmail.com +zenspider: + - ryand-github@zenspider.com + - ryand-ruby@zenspider.com + - zenspider@gmail.com # zsombor zverok: - zverok.offline@gmail.com diff --git a/recipes/files/var/git/.ssh/authorized_keys b/recipes/files/var/git/.ssh/authorized_keys index 300db5d0..04d8f9cf 100644 --- a/recipes/files/var/git/.ssh/authorized_keys +++ b/recipes/files/var/git/.ssh/authorized_keys @@ -80,6 +80,7 @@ environment="SVN_ACCOUNT_NAME=wyhaines" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1+GR environment="SVN_ACCOUNT_NAME=yugui" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC1d1FfWAgzOdx4xSVwHmnAUlK2xqj1ck3rCBECW+t1p1QSQ9StKqq0U+ChUdHBnW3fm7KGLIXiwAysm55+5pvfyfvm+YrdyXwE0XPi2PreIAmHdsJj02EkKmcgJa+DcyRXzYsEmk3VBMCRWNkJTJRGRIqaTEZElCILmQ04/KCM4HgRtvgo5k5Ch/U6gC876h85EnFR91syXxBIZTeOcEIYJq89c5iZEWjWpmLqwEjcCWood6gcjX/b6jlx6jO90dydKHdNPRteh5fDWVPEl54/Qjio30iiHlN6DSarG7AQnOGzq6GHN1F1VDkDLMxGj8b1SwtitBL3HpBaLZYsN3v3hSwhmoPRWpjrZvtxurwedFZHQSHIjigZzGl48WUoWHIOUci9i/iHiHbOvcqPvgqA4vuu820G3SdfR7E0OwzKwqW4o7Z4QLZ+8Gk6KFhXjApUJCXIhhtKl1ucvrz6/e0Rar7Mi3qOKep52VSKYWi5z9f/7NAbkRAJffWBxclgchDzbal3hsaamLrPisjFdml3lQKQyfn2JgYzsYYdaD4izjKutPdgtojRLOTWE9B4dk1838v/wTsabST7qWxt4daBAOB9fRjLuJ0CIKJswAD054SiOdkyllU410iRLS6/lM4zkdD42+nKChhgYvQtcCzErbLhRUiCKWme0BxXFZ7kQw== yugui@yugui-macbookpro-3.local yugui environment="SVN_ACCOUNT_NAME=yui-knk" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3DwgGe2ZC2YBnMLXrncNYrzYkMpQ0CQJvfZj/I92dkXGQ5/7IwyYwMd/XH3fz58IGmYvnsLInnnlBXznCVubV8AH6fw3batpkiAq4AT7yf+Fql/OGn5VOQztxEzOc0LKqDn6WKPzlPvqixj+K3CboXItdURScsMJxwNhBS9WpXKZ9ZMF+BQqb8DddMMRSORNK3JWJBsUgYEJh4CZ00T7IF+xzI/LiQUDdrwzFYyRS1xuPge61LtU/nrNkzGyB4Jpxk4HfJLXsZ/E6B2F8sjDTvCl2AE5fzPzeP/fbnOVBTnGbYg3MZ35gELgIRvjMr6CQtV0derVWUh416M7H6iIv yui-knk environment="SVN_ACCOUNT_NAME=yuki" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCt1xemzgmUZBWDLFdyPhyJRtZpB5l8SNUiS8YpN0ao8FdZVstAHOxTU0kVce2m8yFtSKdImkso/5odjmbEtkc8GGA4fUtSYzye0yyvG6YFyMyc5WjoaBNUWokeY27VMdgp5oaxd4mVK6NVbVa0Q9VMiMoHUvnJUV8F051sXsmOgGzDjpSEUfnad/6J7josjJw7Dm3tuLd6sOzmWl6vB9pyflzgJ8vbP5UXuURl+ywZ/tYz9pM2s75q/pfpzDVmO2HnT2AMUirHt9lU+baAhRl8ZWYQEYt61veOc1aYUFEw3nGrxBIewwfMXEH427zbDlNkh6nJkWftrrmxg3BX8pcFtx5TxQDm/n1SaQyQRVGU+Vy+8yiJs6gFsu9WPxso5+8Lh6aYdRidu4+ZwhiuJ5Mmx0Isv5vSMaceY89Lo0znSzlkycgd3p7uecpT41rSqkxltuRO+aiaQRJhxRm1u9Pg5BtKMkSciGUOxwltrYVtYJExANXfBFRiSPn3qcbFhPtKCVH57X8WBHkSmxuDN4HqwX3k8NmRJxbvE25LFqXVnDzr1t2CZI8qZXHiATqZFCgax3Qe937RoZNDCpYDiZEJHZhSUKfI/JcYWAW0ZXk+J+uMtizY7oYyotT98ZMvOSQRU/hYVKrmEBpp1eM0BGDhJaH6g9VLzW7RdWeY2cjHYw== yuki +environment="SVN_ACCOUNT_NAME=zenspider" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINIZa3bSbmVRBeYUuZ5stuV5WdsrYRvVq0/NFNBME9JY ryan@zenspider.com zenspider environment="SVN_ACCOUNT_NAME=zverok" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7ITHa70oSy3Zl/EyVuzpjM8weDjloRxj/Ld4U3TFe3y9eEgejCvK6sBcaXxC3bkq1LyIQCSv09Mg++/fuYKG+kUc/8lJoSwSUmSUoOVxZ7FIx24pOb2GCnY6hwEQ18bUc56JUSoaZ1N4d/u25nCemJ9Bh+viZjKIcE+a5f9QRir4cAwpb5D19mOEg0buvOmy10QHfkEq7387bqdl63bEQ5UMHh8aFntrgFG83Zy7CJofg2RPEnQt7CpL51N4Bt7emeUZn2s+fSP2BpCZ7YE9ATwkOo971B0Gdv5djYGZDgQESSXUSW0/qNxto20gQ7zfusyFXq3xpKnsG0KxH6twx zverok@meerka environment="SVN_ACCOUNT_NAME=zzak" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCZXuyimZ/XjSqv6+DC4b+IV69gG7fCV4etLQirgMFgicrYd1/tHcLjIjw05htD5ekmEG2m0O4B4CsYozXoES5BjXNp9DZhxHXqr1mtnsZORrNoUCSRBjbf+bDwENERWVSitgJGr2IbrWTu0p/wF7xI9QC4HURZY6mGLA8uKbvirzJPfSxFs9KW7iebwH4eNnuhKaEr/1xmVMabJYkrxFPEAQXo6J2/y9Cf1kht9c35lbvFgiv2TQN77s6PcNnjVWwC26tlqkk99WfOSozIDhqbAQbOlRHwxZFtjuq5IuTfXvrW5LAqVAjEN/Srq594zUUhoFvrNjHRC4GT8t9ZLYWr zzak environment="SVN_ACCOUNT_NAME=zzak" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCobWytkJx0fT/I+zUKJgLArBj6cMIuTrp+/M3eG0OW6t1otHiFh2UcuYLTtsEdXd0lWkiW5Orry5aCX6EdbxZMIxI1iSnBa9oGvkW7A4z5ovtYpJnB8cthGRdK1/OzSoDQKwOfJh+ZAXUNpPlLV45jmTEfW4ASAaQRCjSfbIT+L0MP1QZ3DwHDqUGD6I3i0NTVkZR4NGy+HZshEJ1G34zbPnzjfchabA/pErRmVfJLTnJjo2u0sdGSFiUo+oyJMBxovvcWIoi6VwPilvBOWncqyk1s+u2gO5VCYgwIwILi/+K/+dxI28VDRRC1hxzCVMYQvUP4gejpUoaVhdxDuEVX zzak From a60d521e2f43d1a76784e7336caff007f645ee5a Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 27 Mar 2024 10:52:06 +0900 Subject: [PATCH 35/99] update bundles --- Gemfile.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 30870aca..a364a30b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -18,20 +18,20 @@ GEM thor (>= 1.0.0) net-scp (4.0.0) net-ssh (>= 2.6.5, < 8.0.0) - net-ssh (7.1.0) - net-telnet (0.1.1) + net-ssh (7.2.1) + net-telnet (0.2.0) power_assert (2.0.3) - rake (13.0.6) + rake (13.1.0) schash (0.1.2) sfl (2.3) - specinfra (2.86.0) + specinfra (2.89.0) net-scp net-ssh (>= 2.7) - net-telnet (= 0.1.1) + net-telnet sfl - test-unit (3.6.1) + test-unit (3.6.2) power_assert - thor (1.2.2) + thor (1.3.1) PLATFORMS ruby From abaf9b6b9ccec351fc52d5132c28afb4e7f4175d Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Mon, 1 Apr 2024 15:34:44 -0700 Subject: [PATCH 36/99] Decrease the max number of cgit processes --- .../files/etc/apache2/sites-available/git.ruby-lang.org.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf b/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf index f7e6c6bd..761261dc 100644 --- a/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf +++ b/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf @@ -25,7 +25,7 @@ AllowOverride None Options ExecCGI FollowSymlinks Require all granted - RLimitNPROC 100 + RLimitNPROC 25 ScriptAlias / "/usr/lib/cgit/cgit.cgi/" From 5b834ba97e8a253a741eac4771d0e2e69c7f383e Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 2 Apr 2024 09:59:39 -0700 Subject: [PATCH 37/99] Limit cgit.cgi that was the actual problem --- recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf b/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf index 761261dc..82a637f2 100644 --- a/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf +++ b/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf @@ -33,5 +33,6 @@ AllowOverride None Options ExecCGI FollowSymlinks Require all granted + RLimitNPROC 25 From ac693d4cd135ddc3e72efc100b5e8bfba8f6fea8 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Wed, 3 Apr 2024 11:47:21 -0700 Subject: [PATCH 38/99] Debug spawn --- cgi-bin/webhook.cgi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cgi-bin/webhook.cgi b/cgi-bin/webhook.cgi index caae842a..3c06cbfb 100755 --- a/cgi-bin/webhook.cgi +++ b/cgi-bin/webhook.cgi @@ -185,8 +185,10 @@ class PushHook def execute(*cmd, user:) require 'open3' - stdout, stderr, status = Open3.capture3('/usr/bin/sudo', '-u', user, *cmd) - logger.info("+ #{cmd.join(' ')} (success: #{status.success?})") + cmd = ['/usr/bin/sudo', '-u', user, *cmd] + logger.info("+ #{cmd.join(' ')}") + stdout, stderr, status = Open3.capture3(*cmd) + logger.info("success: #{status.success?}") logger.info("stdout: #{stdout}") logger.info("stderr: #{stderr}") end From b87be880037e5e644a7fe1119aa6eef165301b6d Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Wed, 3 Apr 2024 11:53:57 -0700 Subject: [PATCH 39/99] Try #system instead --- cgi-bin/webhook.cgi | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/cgi-bin/webhook.cgi b/cgi-bin/webhook.cgi index 3c06cbfb..e2ee3a50 100755 --- a/cgi-bin/webhook.cgi +++ b/cgi-bin/webhook.cgi @@ -6,6 +6,7 @@ require 'cgi' require 'json' require 'logger' require 'openssl' +require 'shellwords' class Webhook LOG_PATH = '/tmp/webhook.log' @@ -184,13 +185,9 @@ class PushHook end def execute(*cmd, user:) - require 'open3' cmd = ['/usr/bin/sudo', '-u', user, *cmd] - logger.info("+ #{cmd.join(' ')}") - stdout, stderr, status = Open3.capture3(*cmd) - logger.info("success: #{status.success?}") - logger.info("stdout: #{stdout}") - logger.info("stderr: #{stderr}") + logger.info("+ #{cmd.shelljoin}") + system("#{cmd.shelljoin} > #{LOG_PATH} 2>&1") end end From 7868b10d27de2b4212c87a512df39fac8dab0e1e Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Wed, 3 Apr 2024 11:54:49 -0700 Subject: [PATCH 40/99] Fix a constant reference --- cgi-bin/webhook.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgi-bin/webhook.cgi b/cgi-bin/webhook.cgi index e2ee3a50..dfb0cd3b 100755 --- a/cgi-bin/webhook.cgi +++ b/cgi-bin/webhook.cgi @@ -187,7 +187,7 @@ class PushHook def execute(*cmd, user:) cmd = ['/usr/bin/sudo', '-u', user, *cmd] logger.info("+ #{cmd.shelljoin}") - system("#{cmd.shelljoin} > #{LOG_PATH} 2>&1") + system("#{cmd.shelljoin} > #{Webhook::LOG_PATH} 2>&1") end end From f00916fa499b750709a50907cd20308276545412 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Wed, 3 Apr 2024 12:00:41 -0700 Subject: [PATCH 41/99] Print done --- cgi-bin/webhook.cgi | 1 + 1 file changed, 1 insertion(+) diff --git a/cgi-bin/webhook.cgi b/cgi-bin/webhook.cgi index dfb0cd3b..ecb68713 100755 --- a/cgi-bin/webhook.cgi +++ b/cgi-bin/webhook.cgi @@ -188,6 +188,7 @@ class PushHook cmd = ['/usr/bin/sudo', '-u', user, *cmd] logger.info("+ #{cmd.shelljoin}") system("#{cmd.shelljoin} > #{Webhook::LOG_PATH} 2>&1") + logger.info("done") end end From f846eff54505187bd63979fa25845f441995bcfb Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 4 Apr 2024 18:10:59 +0900 Subject: [PATCH 42/99] Revert "Print done" This reverts commit f00916fa499b750709a50907cd20308276545412. --- cgi-bin/webhook.cgi | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cgi-bin/webhook.cgi b/cgi-bin/webhook.cgi index ecb68713..3c06cbfb 100755 --- a/cgi-bin/webhook.cgi +++ b/cgi-bin/webhook.cgi @@ -6,7 +6,6 @@ require 'cgi' require 'json' require 'logger' require 'openssl' -require 'shellwords' class Webhook LOG_PATH = '/tmp/webhook.log' @@ -185,10 +184,13 @@ class PushHook end def execute(*cmd, user:) + require 'open3' cmd = ['/usr/bin/sudo', '-u', user, *cmd] - logger.info("+ #{cmd.shelljoin}") - system("#{cmd.shelljoin} > #{Webhook::LOG_PATH} 2>&1") - logger.info("done") + logger.info("+ #{cmd.join(' ')}") + stdout, stderr, status = Open3.capture3(*cmd) + logger.info("success: #{status.success?}") + logger.info("stdout: #{stdout}") + logger.info("stderr: #{stderr}") end end From ba88bd576f34570a76721e5e69c546337ba6488d Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 4 Apr 2024 18:31:42 +0900 Subject: [PATCH 43/99] Reapply "Print done" This reverts commit f846eff54505187bd63979fa25845f441995bcfb. --- cgi-bin/webhook.cgi | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/cgi-bin/webhook.cgi b/cgi-bin/webhook.cgi index 3c06cbfb..ecb68713 100755 --- a/cgi-bin/webhook.cgi +++ b/cgi-bin/webhook.cgi @@ -6,6 +6,7 @@ require 'cgi' require 'json' require 'logger' require 'openssl' +require 'shellwords' class Webhook LOG_PATH = '/tmp/webhook.log' @@ -184,13 +185,10 @@ class PushHook end def execute(*cmd, user:) - require 'open3' cmd = ['/usr/bin/sudo', '-u', user, *cmd] - logger.info("+ #{cmd.join(' ')}") - stdout, stderr, status = Open3.capture3(*cmd) - logger.info("success: #{status.success?}") - logger.info("stdout: #{stdout}") - logger.info("stderr: #{stderr}") + logger.info("+ #{cmd.shelljoin}") + system("#{cmd.shelljoin} > #{Webhook::LOG_PATH} 2>&1") + logger.info("done") end end From 37489474de8974b768fdc9bcd72bba33a0413fbd Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Thu, 4 Apr 2024 11:06:08 -0700 Subject: [PATCH 44/99] Avoid truncation --- cgi-bin/webhook.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgi-bin/webhook.cgi b/cgi-bin/webhook.cgi index ecb68713..23d3848b 100755 --- a/cgi-bin/webhook.cgi +++ b/cgi-bin/webhook.cgi @@ -187,7 +187,7 @@ class PushHook def execute(*cmd, user:) cmd = ['/usr/bin/sudo', '-u', user, *cmd] logger.info("+ #{cmd.shelljoin}") - system("#{cmd.shelljoin} > #{Webhook::LOG_PATH} 2>&1") + system("#{cmd.shelljoin} >> #{Webhook::LOG_PATH} 2>&1") logger.info("done") end end From 68d133b3ea224267dad9e541154065c3a8a2cb73 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Thu, 4 Apr 2024 11:30:15 -0700 Subject: [PATCH 45/99] Enable git-sync-check service --- recipes/git-sync-check.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes/git-sync-check.rb b/recipes/git-sync-check.rb index 169895dc..e2e25ea2 100644 --- a/recipes/git-sync-check.rb +++ b/recipes/git-sync-check.rb @@ -13,3 +13,7 @@ owner 'root' notifies :run, 'execute[systemctl daemon-reload]' end + +service 'git-sync-check.timer' do + action [:start, :enable] +end From c12ecf9768ab4be896f35a81f49e61486cc125dc Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Thu, 4 Apr 2024 11:44:20 -0700 Subject: [PATCH 46/99] Add set -x for update-git-ruby-lang-org --- bin/update-git-ruby-lang-org.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/update-git-ruby-lang-org.sh b/bin/update-git-ruby-lang-org.sh index 7dce6c00..195f16ac 100755 --- a/bin/update-git-ruby-lang-org.sh +++ b/bin/update-git-ruby-lang-org.sh @@ -1,4 +1,4 @@ -#!/bin/sh -eu +#!/bin/sh -eux # This is executed as `sudo -u git /home/git/git.ruby-lang.org/bin/update-git-ruby-lang-org.sh` # when GitHub ruby/git.ruby-lang.org's push webhook is delivered to `cgi-bin/webhook.cgi`. # From e5068a45ed4fb8cc57491e20032eb424b2dfc748 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Thu, 4 Apr 2024 11:48:46 -0700 Subject: [PATCH 47/99] Try wrapping a script for debugging --- bin/sudo-u.sh | 4 ++++ cgi-bin/webhook.cgi | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100755 bin/sudo-u.sh diff --git a/bin/sudo-u.sh b/bin/sudo-u.sh new file mode 100755 index 00000000..3ceac238 --- /dev/null +++ b/bin/sudo-u.sh @@ -0,0 +1,4 @@ +#!/bin/sh -eux + +sudo -u "$@" + diff --git a/cgi-bin/webhook.cgi b/cgi-bin/webhook.cgi index 23d3848b..5e801a2c 100755 --- a/cgi-bin/webhook.cgi +++ b/cgi-bin/webhook.cgi @@ -185,7 +185,7 @@ class PushHook end def execute(*cmd, user:) - cmd = ['/usr/bin/sudo', '-u', user, *cmd] + cmd = ['/home/git/git.ruby-lang.org/bin/sudo-u.sh', user, *cmd] logger.info("+ #{cmd.shelljoin}") system("#{cmd.shelljoin} >> #{Webhook::LOG_PATH} 2>&1") logger.info("done") From b899778047a5266dc9a9c75fff4a787b45f28125 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Thu, 4 Apr 2024 11:49:24 -0700 Subject: [PATCH 48/99] Set exception: true --- cgi-bin/webhook.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgi-bin/webhook.cgi b/cgi-bin/webhook.cgi index 5e801a2c..de82c0f0 100755 --- a/cgi-bin/webhook.cgi +++ b/cgi-bin/webhook.cgi @@ -187,7 +187,7 @@ class PushHook def execute(*cmd, user:) cmd = ['/home/git/git.ruby-lang.org/bin/sudo-u.sh', user, *cmd] logger.info("+ #{cmd.shelljoin}") - system("#{cmd.shelljoin} >> #{Webhook::LOG_PATH} 2>&1") + system("#{cmd.shelljoin} >> #{Webhook::LOG_PATH} 2>&1", exception: true) logger.info("done") end end From 7103f377634ca6f80b0d332d8ea07cef4361268a Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Thu, 4 Apr 2024 11:49:47 -0700 Subject: [PATCH 49/99] Set a 3-sec timeout --- cgi-bin/webhook.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgi-bin/webhook.cgi b/cgi-bin/webhook.cgi index de82c0f0..1f7a8d8f 100755 --- a/cgi-bin/webhook.cgi +++ b/cgi-bin/webhook.cgi @@ -187,7 +187,7 @@ class PushHook def execute(*cmd, user:) cmd = ['/home/git/git.ruby-lang.org/bin/sudo-u.sh', user, *cmd] logger.info("+ #{cmd.shelljoin}") - system("#{cmd.shelljoin} >> #{Webhook::LOG_PATH} 2>&1", exception: true) + system("timeout 3 #{cmd.shelljoin} >> #{Webhook::LOG_PATH} 2>&1", exception: true) logger.info("done") end end From 3792faefb196ca155946f9bc50a9f6607245e5dd Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Thu, 4 Apr 2024 11:57:31 -0700 Subject: [PATCH 50/99] Add webhook logs --- .../files/etc/apache2/sites-available/git.ruby-lang.org.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf b/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf index 82a637f2..2ef88219 100644 --- a/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf +++ b/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf @@ -26,6 +26,8 @@ Options ExecCGI FollowSymlinks Require all granted RLimitNPROC 25 + ErrorLog /tmp/webhook_error.log + CustomLog /tmp/webhook_access.log combined ScriptAlias / "/usr/lib/cgit/cgit.cgi/" From c6f7d45366ba043088ba07dfd92b40f6b217f978 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Thu, 4 Apr 2024 12:00:41 -0700 Subject: [PATCH 51/99] Revert "Add webhook logs" This reverts commit 3792faefb196ca155946f9bc50a9f6607245e5dd. --- .../files/etc/apache2/sites-available/git.ruby-lang.org.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf b/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf index 2ef88219..82a637f2 100644 --- a/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf +++ b/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf @@ -26,8 +26,6 @@ Options ExecCGI FollowSymlinks Require all granted RLimitNPROC 25 - ErrorLog /tmp/webhook_error.log - CustomLog /tmp/webhook_access.log combined ScriptAlias / "/usr/lib/cgit/cgit.cgi/" From 2236001e4c315d759613dab3bc0ab0fddcc410c9 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Thu, 4 Apr 2024 13:03:21 -0700 Subject: [PATCH 52/99] Revert "Set a 3-sec timeout" This reverts commit 7103f377634ca6f80b0d332d8ea07cef4361268a. --- cgi-bin/webhook.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgi-bin/webhook.cgi b/cgi-bin/webhook.cgi index 1f7a8d8f..de82c0f0 100755 --- a/cgi-bin/webhook.cgi +++ b/cgi-bin/webhook.cgi @@ -187,7 +187,7 @@ class PushHook def execute(*cmd, user:) cmd = ['/home/git/git.ruby-lang.org/bin/sudo-u.sh', user, *cmd] logger.info("+ #{cmd.shelljoin}") - system("timeout 3 #{cmd.shelljoin} >> #{Webhook::LOG_PATH} 2>&1", exception: true) + system("#{cmd.shelljoin} >> #{Webhook::LOG_PATH} 2>&1", exception: true) logger.info("done") end end From 4ff102dac00fc438115e4b2643e9aa81f61c0919 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Thu, 4 Apr 2024 13:06:48 -0700 Subject: [PATCH 53/99] Revert "Try wrapping a script for debugging" This reverts commit e5068a45ed4fb8cc57491e20032eb424b2dfc748. --- bin/sudo-u.sh | 4 ---- cgi-bin/webhook.cgi | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100755 bin/sudo-u.sh diff --git a/bin/sudo-u.sh b/bin/sudo-u.sh deleted file mode 100755 index 3ceac238..00000000 --- a/bin/sudo-u.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -eux - -sudo -u "$@" - diff --git a/cgi-bin/webhook.cgi b/cgi-bin/webhook.cgi index de82c0f0..03dd3f5f 100755 --- a/cgi-bin/webhook.cgi +++ b/cgi-bin/webhook.cgi @@ -185,7 +185,7 @@ class PushHook end def execute(*cmd, user:) - cmd = ['/home/git/git.ruby-lang.org/bin/sudo-u.sh', user, *cmd] + cmd = ['/usr/bin/sudo', '-u', user, *cmd] logger.info("+ #{cmd.shelljoin}") system("#{cmd.shelljoin} >> #{Webhook::LOG_PATH} 2>&1", exception: true) logger.info("done") From 34901b6b10f4dffbfb24c1e79fa91cfbb21b8c1e Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Thu, 4 Apr 2024 13:55:00 -0700 Subject: [PATCH 54/99] Try removing RLimitNPROC for webhook --- recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf b/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf index 82a637f2..ec12f0c1 100644 --- a/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf +++ b/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf @@ -25,7 +25,6 @@ AllowOverride None Options ExecCGI FollowSymlinks Require all granted - RLimitNPROC 25 ScriptAlias / "/usr/lib/cgit/cgit.cgi/" From c13c8a72f2df5518ff6cb80dee804371679d8670 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Mon, 6 May 2024 00:37:17 -0700 Subject: [PATCH 55/99] Try a different way to enable git-sync-check.timer --- recipes/git-sync-check.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes/git-sync-check.rb b/recipes/git-sync-check.rb index e2e25ea2..99a1cc18 100644 --- a/recipes/git-sync-check.rb +++ b/recipes/git-sync-check.rb @@ -15,5 +15,9 @@ end service 'git-sync-check.timer' do - action [:start, :enable] + action :start +end + +link '/etc/systemd/system/timers.target.wants/git-sync-check.timer' do + to '/etc/systemd/system/git-sync-check.timer' end From 9c432e2e1242ab96e4ba1101675dd3420aa14de6 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Mon, 6 May 2024 00:39:40 -0700 Subject: [PATCH 56/99] Reflect the current settings to the source I think we reduced it when it was too much for the machine spec. --- .../files/etc/apache2/sites-available/git.ruby-lang.org.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf b/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf index ec12f0c1..d38a8564 100644 --- a/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf +++ b/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf @@ -32,6 +32,6 @@ AllowOverride None Options ExecCGI FollowSymlinks Require all granted - RLimitNPROC 25 + RLimitNPROC 5 From b02f2ba510b639eb8f27e5c13b4d7589899cc784 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Mon, 6 May 2024 00:47:08 -0700 Subject: [PATCH 57/99] Add a workaround for git/bullseye-backports --- recipes/default.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/default.rb b/recipes/default.rb index 47be3b64..68a7aa50 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -2,7 +2,9 @@ package 'cgit' package 'certbot' -package 'git/bullseye-backports' +package 'git/bullseye-backports' do + only_if '[[ $(git -v) != "git version 2.39.2" ]]' +end package 'ruby' package 'postfix' package 'gpg' From 84bcbf8778596ad2231acbfffb03d4b616eb0d11 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Wed, 29 May 2024 17:25:10 -0700 Subject: [PATCH 58/99] Update branch maintainers --- bin/check-email-and-refname.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/check-email-and-refname.rb b/bin/check-email-and-refname.rb index 899fee18..4d7fa871 100755 --- a/bin/check-email-and-refname.rb +++ b/bin/check-email-and-refname.rb @@ -12,7 +12,7 @@ "naruse", ] STABLE_BRANCH_MAINTAINERS = [ - "usa", + "k0kubun", "nagachika", ] PUSHABLE_REFNAMES = [ From f7909fe5f9989b3b0777d033b62f96c5a411b4e1 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 16 Jul 2024 09:53:16 -0700 Subject: [PATCH 59/99] Use OnCalendar instead --- recipes/files/etc/systemd/system/git-sync-check.timer | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes/files/etc/systemd/system/git-sync-check.timer b/recipes/files/etc/systemd/system/git-sync-check.timer index a48e8da6..daf70c94 100644 --- a/recipes/files/etc/systemd/system/git-sync-check.timer +++ b/recipes/files/etc/systemd/system/git-sync-check.timer @@ -2,8 +2,7 @@ Description=Timer for git-sync-check.service [Timer] -# OnBootSec=1min -OnUnitActiveSec=10min +OnCalendar=*:0/10 Unit=git-sync-check.service [Install] From 15b4949d95baa7d0d7b058b246fb4dfc4c5bf2cf Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 16 Jul 2024 10:15:06 -0700 Subject: [PATCH 60/99] Recover notes inconsistencies as well --- bin/git-sync-check.rb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/bin/git-sync-check.rb b/bin/git-sync-check.rb index 1a553b50..f01c41ed 100755 --- a/bin/git-sync-check.rb +++ b/bin/git-sync-check.rb @@ -119,13 +119,14 @@ def self.check_consistency rescue GitSyncCheck::Errors => e attempts -= 1 if attempts > 0 - # Automatically fix inconsistency if it's master, but never sync random new branches. - ref = 'refs/heads/master' - if e.errors.key?(ref) - remote_rev, local_rev = e.errors['refs/heads/master'] - puts "Fixing inconsistency ref:#{ref.inspect} remote:#{remote_rev.inspect} local:#{local_rev.inspect}" - unless system('/home/git/git.ruby-lang.org/bin/update-ruby.sh', File.basename(ref)) - raise "Failed to execute update-ruby.sh for #{ref}" + # Automatically fix inconsistency if it's master or notes, but never sync random new branches. + ['refs/heads/master', 'refs/notes/commits'].each do |ref| + if e.errors.key?(ref) + remote_rev, local_rev = e.errors['refs/heads/master'] + puts "Fixing inconsistency ref:#{ref.inspect} remote:#{remote_rev.inspect} local:#{local_rev.inspect}" + unless system('/home/git/git.ruby-lang.org/bin/update-ruby.sh', File.basename(ref)) + raise "Failed to execute update-ruby.sh for #{ref}" + end end end sleep 5 From e6f416d4145c94c51f2b87f231eb84e2ff7cc796 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 16 Jul 2024 10:17:04 -0700 Subject: [PATCH 61/99] Fix a wrong ref usage --- bin/git-sync-check.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/git-sync-check.rb b/bin/git-sync-check.rb index f01c41ed..5b9563ca 100755 --- a/bin/git-sync-check.rb +++ b/bin/git-sync-check.rb @@ -122,7 +122,7 @@ def self.check_consistency # Automatically fix inconsistency if it's master or notes, but never sync random new branches. ['refs/heads/master', 'refs/notes/commits'].each do |ref| if e.errors.key?(ref) - remote_rev, local_rev = e.errors['refs/heads/master'] + remote_rev, local_rev = e.errors[ref] puts "Fixing inconsistency ref:#{ref.inspect} remote:#{remote_rev.inspect} local:#{local_rev.inspect}" unless system('/home/git/git.ruby-lang.org/bin/update-ruby.sh', File.basename(ref)) raise "Failed to execute update-ruby.sh for #{ref}" From 622acce62810f538ad052ae30725c6abc1716b7f Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 16 Jul 2024 10:22:36 -0700 Subject: [PATCH 62/99] Revert "Fix a wrong ref usage" This reverts commit e6f416d4145c94c51f2b87f231eb84e2ff7cc796. --- bin/git-sync-check.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/git-sync-check.rb b/bin/git-sync-check.rb index 5b9563ca..f01c41ed 100755 --- a/bin/git-sync-check.rb +++ b/bin/git-sync-check.rb @@ -122,7 +122,7 @@ def self.check_consistency # Automatically fix inconsistency if it's master or notes, but never sync random new branches. ['refs/heads/master', 'refs/notes/commits'].each do |ref| if e.errors.key?(ref) - remote_rev, local_rev = e.errors[ref] + remote_rev, local_rev = e.errors['refs/heads/master'] puts "Fixing inconsistency ref:#{ref.inspect} remote:#{remote_rev.inspect} local:#{local_rev.inspect}" unless system('/home/git/git.ruby-lang.org/bin/update-ruby.sh', File.basename(ref)) raise "Failed to execute update-ruby.sh for #{ref}" From a6ab8070ea61d04f203cff2caf58cf3705e04f3a Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 16 Jul 2024 10:22:41 -0700 Subject: [PATCH 63/99] Revert "Recover notes inconsistencies as well" This reverts commit 15b4949d95baa7d0d7b058b246fb4dfc4c5bf2cf. --- bin/git-sync-check.rb | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/bin/git-sync-check.rb b/bin/git-sync-check.rb index f01c41ed..1a553b50 100755 --- a/bin/git-sync-check.rb +++ b/bin/git-sync-check.rb @@ -119,14 +119,13 @@ def self.check_consistency rescue GitSyncCheck::Errors => e attempts -= 1 if attempts > 0 - # Automatically fix inconsistency if it's master or notes, but never sync random new branches. - ['refs/heads/master', 'refs/notes/commits'].each do |ref| - if e.errors.key?(ref) - remote_rev, local_rev = e.errors['refs/heads/master'] - puts "Fixing inconsistency ref:#{ref.inspect} remote:#{remote_rev.inspect} local:#{local_rev.inspect}" - unless system('/home/git/git.ruby-lang.org/bin/update-ruby.sh', File.basename(ref)) - raise "Failed to execute update-ruby.sh for #{ref}" - end + # Automatically fix inconsistency if it's master, but never sync random new branches. + ref = 'refs/heads/master' + if e.errors.key?(ref) + remote_rev, local_rev = e.errors['refs/heads/master'] + puts "Fixing inconsistency ref:#{ref.inspect} remote:#{remote_rev.inspect} local:#{local_rev.inspect}" + unless system('/home/git/git.ruby-lang.org/bin/update-ruby.sh', File.basename(ref)) + raise "Failed to execute update-ruby.sh for #{ref}" end end sleep 5 From c81cb6a6966a1a90d9dc3f16a90b49dfd8918f72 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 16 Jul 2024 10:24:17 -0700 Subject: [PATCH 64/99] Give up synchronizing refs/notes/commits --- bin/git-sync-check.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/git-sync-check.rb b/bin/git-sync-check.rb index 1a553b50..5c94c6ee 100755 --- a/bin/git-sync-check.rb +++ b/bin/git-sync-check.rb @@ -93,6 +93,7 @@ def self.check_consistency # Remove refs which are not to be checked here. remote_refs.delete('HEAD') # show-ref does not show it + remote_refs.delete('refs/notes/commits') # it seems too complicated to recover its inconsistency remote_refs.keys.each { |ref| remote_refs.delete(ref) if ref.match(%r[\Arefs/pull/\d+/\w+\z]) } # pull requests # Check consistency From 201c481f3b20e56f30d130b336d9551acc6db59a Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 16 Jul 2024 10:26:56 -0700 Subject: [PATCH 65/99] Make sure it's deleted properly --- bin/git-sync-check.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bin/git-sync-check.rb b/bin/git-sync-check.rb index 5c94c6ee..aab25a36 100755 --- a/bin/git-sync-check.rb +++ b/bin/git-sync-check.rb @@ -92,13 +92,14 @@ def self.check_consistency local_refs = Hash[show_ref.lines.map { |l| rev, ref = l.chomp.split(' '); [ref, rev] }] # Remove refs which are not to be checked here. - remote_refs.delete('HEAD') # show-ref does not show it - remote_refs.delete('refs/notes/commits') # it seems too complicated to recover its inconsistency - remote_refs.keys.each { |ref| remote_refs.delete(ref) if ref.match(%r[\Arefs/pull/\d+/\w+\z]) } # pull requests + refs = remote_refs.keys | local_refs.keys + refs.delete('HEAD') # show-ref does not show it + refs.delete('refs/notes/commits') # it seems too complicated to recover its inconsistency + remote_refs.keys.each { |ref| refs.delete(ref) if ref.match(%r[\Arefs/pull/\d+/\w+\z]) } # pull requests # Check consistency errors = {} - (remote_refs.keys | local_refs.keys).each do |ref| + refs.each do |ref| remote_rev = remote_refs[ref] local_rev = local_refs[ref] From 10d3426aa23084ff1bb77f33da8b4807ee4b2d2c Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 16 Jul 2024 10:34:39 -0700 Subject: [PATCH 66/99] Add k0kubun to ADMIN_USERS to fix notes --- bin/check-email-and-refname.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/check-email-and-refname.rb b/bin/check-email-and-refname.rb index 4d7fa871..90d5b32e 100755 --- a/bin/check-email-and-refname.rb +++ b/bin/check-email-and-refname.rb @@ -9,6 +9,7 @@ ADMIN_USERS = [ "git", "hsbt", + "k0kubun", "naruse", ] STABLE_BRANCH_MAINTAINERS = [ From 2d4c75ddfbe3a665da1fae35e833f8e7cdf65318 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 19 Jul 2024 10:05:25 +0900 Subject: [PATCH 67/99] Bump up Ruby 2.7.8 --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index a4dd9dba..6a81b4c8 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.4 +2.7.8 From a326547bacd055a7589aa5352165b49ea8b9dbc9 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 19 Jul 2024 10:05:44 +0900 Subject: [PATCH 68/99] Added postfix recipe We try to the following changes for unreachable issue. ``` smtp_address_preference = ipv4 ``` --- recipes/default.rb | 1 + recipes/files/etc/postfix/main.cf | 48 +++++++++++++++++++++++++++++++ recipes/postfix.rb | 4 +++ 3 files changed, 53 insertions(+) create mode 100644 recipes/files/etc/postfix/main.cf create mode 100644 recipes/postfix.rb diff --git a/recipes/default.rb b/recipes/default.rb index 68a7aa50..3ee3f149 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -11,6 +11,7 @@ package 'rsync' include_recipe 'apache2' +include_recipe 'postfix' include_recipe 'cgit' include_recipe 'git-user' include_recipe 'git-sync-check' diff --git a/recipes/files/etc/postfix/main.cf b/recipes/files/etc/postfix/main.cf new file mode 100644 index 00000000..b13e04b5 --- /dev/null +++ b/recipes/files/etc/postfix/main.cf @@ -0,0 +1,48 @@ +# See /usr/share/postfix/main.cf.dist for a commented, more complete version + + +# Debian specific: Specifying a file name will cause the first +# line of that file to be used as the name. The Debian default +# is /etc/mailname. +#myorigin = /etc/mailname + +smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU) +biff = no + +# appending .domain is the MUA's job. +append_dot_mydomain = no + +# Uncomment the next line to generate "delayed mail" warnings +#delay_warning_time = 4h + +readme_directory = no + +# See http://www.postfix.org/COMPATIBILITY_README.html -- default to 2 on +# fresh installs. +compatibility_level = 2 + + + +# TLS parameters +smtpd_tls_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem +smtpd_tls_key_file=/etc/ssl/private/ssl-cert-snakeoil.key +smtpd_tls_security_level=may + +smtp_tls_CApath=/etc/ssl/certs +smtp_tls_security_level=may +smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache + + +smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated defer_unauth_destination +myhostname = git.ruby-lang.org +alias_maps = hash:/etc/aliases +alias_database = hash:/etc/aliases +myorigin = /etc/mailname +mydestination = $myhostname, git.ruby-lang.org, localhost.ruby-lang.org, , localhost +relayhost = +mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 +mailbox_size_limit = 0 +recipient_delimiter = + +inet_interfaces = all +inet_protocols = all +smtp_address_preference = ipv4 diff --git a/recipes/postfix.rb b/recipes/postfix.rb new file mode 100644 index 00000000..d21d79c7 --- /dev/null +++ b/recipes/postfix.rb @@ -0,0 +1,4 @@ +remote_file '/etc/postfix/main.cf' do + mode '644' + owner 'root' +end From a31af151a1ef1c6d30fcb234256b2b7dbabcc878 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 13 Aug 2024 09:22:37 -0700 Subject: [PATCH 69/99] Make sure every failure is reported to alerts-sync --- bin/update-default-gem.sh | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/bin/update-default-gem.sh b/bin/update-default-gem.sh index 1da7bc52..644e5be1 100755 --- a/bin/update-default-gem.sh +++ b/bin/update-default-gem.sh @@ -23,6 +23,15 @@ function log() { echo -e "[$$: $(date "+%Y-%m-%d %H:%M:%S %Z")] $1" >> "$log_path" } +# Run a given command. If it fails, notify Slack and exits abnormally. +function run() { + if ! "$@"; then + "${this_repo}/bin/notify-slack-failed-gem-update.rb" "$log_path" >> "$log_path" 2>&1 + log "Failed: $@" + exit 1 + fi +} + # Initialize working directory only if missing if [ ! -d "$ruby_workdir" ]; then git clone "file://${ruby_repo}" "$ruby_workdir" @@ -30,16 +39,12 @@ fi log "### start ###" -git -C "$ruby_workdir" fetch origin master >> "$log_path" 2>&1 -git -C "$ruby_workdir" reset --hard origin/master >> "$log_path" 2>&1 +run git -C "$ruby_workdir" fetch origin master >> "$log_path" 2>&1 +run git -C "$ruby_workdir" reset --hard origin/master >> "$log_path" 2>&1 -if ruby -C "$ruby_workdir" tool/sync_default_gems.rb "$gem_name" "$before..$after" >> "$log_path" 2>&1; then - # Pushing ruby_workdir to cgit to make sure all git hooks are performed on sync-ed commits. - if ! SVN_ACCOUNT_NAME=git git -C "$ruby_workdir" push origin "HEAD:master" >> "$log_path" 2>&1; then - log "Failed: git push" - fi -else - "${this_repo}/bin/notify-slack-failed-gem-update.rb" "$log_path" >> "$log_path" 2>&1 -fi +run ruby -C "$ruby_workdir" tool/sync_default_gems.rb "$gem_name" "$before..$after" >> "$log_path" 2>&1 + +# Pushing ruby_workdir to cgit to make sure all git hooks are performed on sync-ed commits. +SVN_ACCOUNT_NAME=git run git -C "$ruby_workdir" push origin "HEAD:master" >> "$log_path" 2>&1 log "### end ###\n" From ac42819836b076ba3915677ad13588f610b7b71f Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 13 Aug 2024 09:31:03 -0700 Subject: [PATCH 70/99] Print what is being executed --- bin/update-default-gem.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/update-default-gem.sh b/bin/update-default-gem.sh index 644e5be1..2e32bb53 100755 --- a/bin/update-default-gem.sh +++ b/bin/update-default-gem.sh @@ -25,6 +25,7 @@ function log() { # Run a given command. If it fails, notify Slack and exits abnormally. function run() { + echo "$ $@" if ! "$@"; then "${this_repo}/bin/notify-slack-failed-gem-update.rb" "$log_path" >> "$log_path" 2>&1 log "Failed: $@" From c55b2c4fe7973af0bc1a47c5ce345e60eb193d2f Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 13 Aug 2024 09:31:43 -0700 Subject: [PATCH 71/99] Append logs to the file --- bin/update-default-gem.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/update-default-gem.sh b/bin/update-default-gem.sh index 2e32bb53..97668031 100755 --- a/bin/update-default-gem.sh +++ b/bin/update-default-gem.sh @@ -25,7 +25,7 @@ function log() { # Run a given command. If it fails, notify Slack and exits abnormally. function run() { - echo "$ $@" + echo "$ $@" >> "$log_path" if ! "$@"; then "${this_repo}/bin/notify-slack-failed-gem-update.rb" "$log_path" >> "$log_path" 2>&1 log "Failed: $@" From 473aa8744efea2aa628c76e55cf9387c9ee9b9a8 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 13 Aug 2024 09:33:13 -0700 Subject: [PATCH 72/99] Print commands like bash --- bin/update-default-gem.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/update-default-gem.sh b/bin/update-default-gem.sh index 97668031..d96661f2 100755 --- a/bin/update-default-gem.sh +++ b/bin/update-default-gem.sh @@ -25,7 +25,7 @@ function log() { # Run a given command. If it fails, notify Slack and exits abnormally. function run() { - echo "$ $@" >> "$log_path" + echo "+ $@" >> "$log_path" if ! "$@"; then "${this_repo}/bin/notify-slack-failed-gem-update.rb" "$log_path" >> "$log_path" 2>&1 log "Failed: $@" From e73806e866344b502e7d87ed8be164b5c8f5fc1e Mon Sep 17 00:00:00 2001 From: Naoto Ono Date: Tue, 20 Aug 2024 13:25:26 +0900 Subject: [PATCH 73/99] Add ono-max's email and SSH key --- config/email.yml | 2 ++ recipes/files/var/git/.ssh/authorized_keys | 1 + 2 files changed, 3 insertions(+) diff --git a/config/email.yml b/config/email.yml index 364f7554..55888ae9 100644 --- a/config/email.yml +++ b/config/email.yml @@ -143,6 +143,8 @@ odaira: - rodaira@us.ibm.com okkez: - okkez000@gmail.com +ono-max: + - onoto1998@gmail.com peter.zhu: - peter@peterzhu.ca - peter.zhu@ruby-lang.org diff --git a/recipes/files/var/git/.ssh/authorized_keys b/recipes/files/var/git/.ssh/authorized_keys index 04d8f9cf..a08da6e5 100644 --- a/recipes/files/var/git/.ssh/authorized_keys +++ b/recipes/files/var/git/.ssh/authorized_keys @@ -54,6 +54,7 @@ environment="SVN_ACCOUNT_NAME=nobu" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBHTmLI5 environment="SVN_ACCOUNT_NAME=normal" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0BnUlAXthqVxirRDQET7ENBC/N05m/dWiLSrSBu690mO+ZLjSnsUAp0Yz/S6xheVzoQDq64ezbZaC7nD1YMAreq7QKqw/XpRIi+IqxtFBFWKCecGFg7a/Zrm+/k9Wb5pJZegwhmMUBJYQ6LfnfTh/n987PwgWfAQYUfQO95nOPWu3GvJLhLFms4p3aiNYKLnWfNGg0fNjf5cFvWSiuT0BmNxCyaLPZDMwvhVRV57DPyFe+oSixOTIVUK2WjpgrABYXvDZOVO/DAMhi449ltCvvTBYEjHPgl+c7eDSpHA3nP1qJESt4CCeJEnWjBVypQ9YAizeWDrysqd1B09WfK/1Q== ew@dcvr normal environment="SVN_ACCOUNT_NAME=odaira" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuthmDtlvEbnqDgW00t/56yZRG1cgNlWgtIFkkaviphHVCKgpwLOzhA0pMA7qcT84ar6ziEg44dN93FUTQ5DB6poQpn7wDJPYokMmUxfSUhi/+DUdq7NiQDevWggTgH99TPyQIJYCiC03M76qDZCKW4C1q0+FztgV+gWTD/mL07PucUjiqTk272QLl/jGd/8mJ76p2yy+HGKA1BHDNeDQXiukFBhLd92SKXeA8Uyy63BCXuGs/Ys92qGHuCOO9+EYXmFIcV9phyNjD6mrU1sRhpWFdl+JipPow0JbVNZRctIZ3Rl3cMv44X/HJGsBkMWa0KEqW8wGy9i8b5hEpGnrKQ== rayod@ss odaira environment="SVN_ACCOUNT_NAME=okkez" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAmqvlrnrSDD+OBSr1BNEhnPD3O3UOI6puAg7RLkn1nwfb6327ZH6xGWOf6Jm+Sv3383Xvt6Dxqrbl0gHICjMT+47c6a8B+76WRX6vg1s/Lhx7YyW3zOk3CmVg8KJ+px1/qwYqexYy9ud+eYnewO4rbI+qvrEpoMWFGE8/LkTZiJI02UmUkKz07+xlVN5h76G7S2OBaJULKzv83FnruKD37y50h/4zXtvPlrGQ0in1tMzz/pzYyfj3QWRrXiU4Ef7MbRGyoceb2ZhPwcM2dGTsMHCiNM5R38OZkxwe0/SE5LWT3jHoDvHs2YW3FjjtDtvsKB/O2G7bcRtTHsiHOJlrHw== kenji@suzaku okkez +environment="SVN_ACCOUNT_NAME=ono-max" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQD6XhWW0T6dXuX0Ih96lPKx0XJSxoeB9K22YwDeJOGim+r+SvIKGnpWKXlNL6L5rOIH5oC/FgWS+OqPb66lYKf2lRil05Mxt11RECeSq/g5fhQ2hVNmbIOF3RsGXk6IU6LjD4SAA8sLwAg9CdxWNzAG+RHmjTnM35cWrVSN+cANfOZbg8WySkJlSbHGQJSAmjmAoF5AfwTssAlh28NA16kGFamjoY8qnAAHRPjUdzrvB/ZIcPm7vE/8KyszJhIUobobmF0C53yY5I7gtiPruk12np703Cpa+RGmhibVnfKH+gJbc/wFASnVFpTK+USwoKDLwP2coRawoQpgadxMSzN7Fvj4vICX0pPwYLq2uDgEB+ZnEE2COAD9ipJMtqWZ0JeZ8avzgLzR9heSc/F5OvbFHgeogyeM3Y23td8uNIktkQjabGv/BU5r+9a8SCJP7E3qgZXfCqdU+7z10DhrxRKZmlahx4eHvlJ6LpzBfMNpo4IgxqKm0dkMW7YSyCUQKdE= ono-max environment="SVN_ACCOUNT_NAME=peter.zhu" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDU8CjlqhqFMEETZSzMDjjV38iBmeMfyYrVbYWSQsQQFQf2iPhLaLSu8Z3NUf5YFSIYf/vX/Wj6tPspA9y8MUYzdnJRGXC+yFvCCUYSXu0W2uV8G5TK+cB3FP1aBu1OFhwktRzJEpTk5ntRG8V+jNdJLIcQYRU1zFNcGzJoqzJEK+TmZ9NSdkdP6cqHSWFKZawxefPjBS/iwWaP86RG6EZluD3tmAfzgoQVIyDt+quX4vjatgHusI8R8mVXyFRuSy13O9eFsr32Ef7q45mZPb0MfukYDK8qUL9qhj8dOE8X5fD3MBl8a6v0dSoH8gbgH5r/Morn1aK6rhIIpMhGOmju/f+Y78B5TBkI/7/ugCso/+hMTRBjj6mkw5IbzqEsH8dZYjPEB7efx5XbSdP90FA7q8yPO0GbKt4CLBaUCNzO1ZRwirmiDjP639iLuyoSTJXsVco6XuMHR2ufUv1TNYRQCRjxHsOB7SzJEh4hLXwj8P8MoLIlk2SSpezACd4BqEZZFPIeBS5Pl2KnSRYs6YgoFwdpi4ACiOvDkbhkus4ETJYQOXBEPrdu9CEGVfSormmSVOcbBSw7jVLm3GJqC9Zxt/GTsnB7jSBZj9HPbyRvyHmxy+sCTrSxr5NDvWly2sRbx0eTNmOoAQJ5EoM2/tf+I/2MrzQvaBm4P1C7W36tPQ== peter@peterzhu.ca environment="SVN_ACCOUNT_NAME=pocke" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVxdpr0Lh4Ec/kmaRwT+Cgbs+8ru7prRHFsYTMcQeLRYDBZ0okaL5ouqOw9rFw88CrCLIJRLhXfgVjoOTi9srQuXFIDy8l8aQlLLwTj82U2RSKkcdeCuPA49IWDUoFXtHCvNkVDfsB97+xWUrhR8ugw8McDlvj6W54RFSFdloJazydUi0c4CdDPCS6cpbSNJPWOhSmkMU99fwy6kN2WR0CMikkTuMmDT5btXZL5uUoixoQCrgWt0gsNW3bgbz1/wC2arZp1rpUlrOG+dF7MvvQGXVo3RCFfzwr3LOoXOdrecI7iAgUhxbiMlLYX3jU8E7y5h3LArdbRz1QvbptqbQX pocke@ruby-lang.org environment="SVN_ACCOUNT_NAME=rhe" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICLecn7rs5Nk35xn3KJ2F6JT61bgjYH1/ZKhFZWoNrFp rhe From 8ebd1d935853c4d7c688ba6d51d115e64480e6d5 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Mon, 2 Sep 2024 09:14:10 -0700 Subject: [PATCH 74/99] Add an ed25519 key for k0kubun --- recipes/files/var/git/.ssh/authorized_keys | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/files/var/git/.ssh/authorized_keys b/recipes/files/var/git/.ssh/authorized_keys index a08da6e5..f980ea2b 100644 --- a/recipes/files/var/git/.ssh/authorized_keys +++ b/recipes/files/var/git/.ssh/authorized_keys @@ -23,8 +23,8 @@ environment="SVN_ACCOUNT_NAME=jemma" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCzWMl environment="SVN_ACCOUNT_NAME=jeremy" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE1s0ie7GIiU3kIhB6Pb0LH5Ljdb3oqCLE9Je08M40c3 jeremy@speedstar.jeremyevans.local environment="SVN_ACCOUNT_NAME=jeremy" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAwcDSfizu8bfaJ9Z5h+375qCiuJ4bp2kf8shO2fhmwC4KFG2al398BpUjlsZVHEVDIUGU3rhM+GHEUGvBF14rke1aSR+rM6RHeXCoWHCAdy8tvm9PzuAUWsM97d6oEKIchm0rOaJ0GX95gVldc190NfzQQ+vIUthxjxuPWXtKzVpcJiZiF3AR7hST+u6oUltx64sdJ0aKc3xhWAG48n8CIrQlnQZ0bLZw4Jtz9y8jinL6uXHQ2I+3USyeg+OvDPqThL3uo1IYbKfMdPaxW8xR7a6dnPex3Kx8I0Ay/KRdMHEfbUeN0zclmbclqVUa/3qRKSbB5uod8lYkpK2sUisFZQ== jeremy@speedstar.jeremyevans.local environment="SVN_ACCOUNT_NAME=jhawthorn" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ4FsiavriYpm9GKVP2TEztHxnzwiYRosx7fWI5LN3cl -environment="SVN_ACCOUNT_NAME=k0kubun" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDTBqmCx8FUX01dLomDUhE+El33VsKMpDF7aTj2p05NKrlUmIfLD0BKkVUP1yLlJpDZsz83oogjlH5XZl4q7AvH4PNCbIiUuXxDeJevo5hDpqDaaBSDiDU0WRF82sng1bDrLCjXVXsXQ/nQLS7PsWFyBIlunnRHSO91NnZwhxxJgp9K89a0tFpTn/koRuW6b8om++1UtoY8+rjIC11qtj9G1hj78rqeJmNtWdoJsIG5qcjNl/DikJBhTLenAOTwK1BzhHdo0doTdZzal+6koE9fZ/lv8DvAciJr8IDIdHd73XJKFlm7GcOZ3EO/1N9JUbNHDCd+dWFolTqWghxa9Dr k0kubun@bionic k0kubun -environment="SVN_ACCOUNT_NAME=k0kubun" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDX0n3K6bPNpOGWQqjv2cX5EQVs6vhQjRFTvu0sKQUHsx2WkyzIUvQzXFdBzoPo8sP3JyAOnXI46TYrHuILvInEm1VKBK5fVUio4kUqljiFdWSDATMmA7JTlKNzKXlpNzov20cMjpCQh+sBoGk2rDXKG4pZj7VBebamTiFJAhyeDh54WTO2lHTAL+pkbKQ7MVs9v8VZOPHX+sSAyYDPd7p0BFGxu95oSoYLMYdufCIjO0ZQJNp/i7Uo+YJ5oHruQn5akmpI6p6JfT5HbbnuapA+mQPediydbjKWMXwTRF82CEZWdL9S5YeL3VBSjjBE441uR1GRnkMsKsYb2/hC97a7 k0kubun@xenial k0kubun +environment="SVN_ACCOUNT_NAME=k0kubun" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN1UcvTB/sH5hdIaPvH7lgixOB0APaeAOMlyRwrq6NqS +environment="SVN_ACCOUNT_NAME=k0kubun" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDTBqmCx8FUX01dLomDUhE+El33VsKMpDF7aTj2p05NKrlUmIfLD0BKkVUP1yLlJpDZsz83oogjlH5XZl4q7AvH4PNCbIiUuXxDeJevo5hDpqDaaBSDiDU0WRF82sng1bDrLCjXVXsXQ/nQLS7PsWFyBIlunnRHSO91NnZwhxxJgp9K89a0tFpTn/koRuW6b8om++1UtoY8+rjIC11qtj9G1hj78rqeJmNtWdoJsIG5qcjNl/DikJBhTLenAOTwK1BzhHdo0doTdZzal+6koE9fZ/lv8DvAciJr8IDIdHd73XJKFlm7GcOZ3EO/1N9JUbNHDCd+dWFolTqWghxa9Dr environment="SVN_ACCOUNT_NAME=kanemoto" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAt1/3mzBCtD2v1sIqBxvvqPOefd6jvUrEDzDYoXgW5tRieV+UmdQC+HZGeNURzl6CwiwLR6wHziyOyREsJtsMtdHiAk7A0pbaOVT9sLAc01gHYB3k6eXxt7ybB+BdOsHgEtgJUvI8JTF+E26IlfM44GYJbhlL4aEcFEdZPXkolLLWY5+qXe2rizPz/bt9vnc4b720AfQC74JrtRalbCGPawLcV7y4smLE+kRjmzS5o5rbBe6kgyZ2n9X6IguPz+Fzy6YLzEiRL7uD834WK4rD5vXPQTSiXiO3apGZSu9q+MDi4cGTp2eXzyFsTHOFebKGfjCUfcDqgrtjfCTj3f5pXw== kanemoto@miggy kanemoto environment="SVN_ACCOUNT_NAME=katei" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIezAMzVD8CSCNQR1mnvyWxg8AcHn3wJ2Yoj9YPhHl6t environment="SVN_ACCOUNT_NAME=kazu" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILpK0tF51R1sMBfYpLNNogDQEVuM1twtKPlH93EI/q+/ kazu@elk kazu From beb97ffb305636fb2f0f6c608ce6cb30ac9148a0 Mon Sep 17 00:00:00 2001 From: eileencodes Date: Fri, 4 Oct 2024 08:43:12 -0400 Subject: [PATCH 75/99] Add eileencodes to email.yml and ssh keys Ref: https://bugs.ruby-lang.org/issues/20728 --- config/email.yml | 2 ++ recipes/files/var/git/.ssh/authorized_keys | 1 + 2 files changed, 3 insertions(+) diff --git a/config/email.yml b/config/email.yml index 55888ae9..dae560c7 100644 --- a/config/email.yml +++ b/config/email.yml @@ -43,6 +43,8 @@ eban: eightbitraptor: - eightbitraptor@ruby-lang.org - matt@eightbitraptor.com +eileencodes: + - eileencodes@gmail.com eregon: - eregontp@gmail.com - eregon@ruby-lang.org diff --git a/recipes/files/var/git/.ssh/authorized_keys b/recipes/files/var/git/.ssh/authorized_keys index f980ea2b..dee3cde9 100644 --- a/recipes/files/var/git/.ssh/authorized_keys +++ b/recipes/files/var/git/.ssh/authorized_keys @@ -10,6 +10,7 @@ environment="SVN_ACCOUNT_NAME=dblack" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAyFAfqq environment="SVN_ACCOUNT_NAME=duerst" ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAj3xR5x6inzlL8Ot6eVvPB1fmIp05LHR0Ga6PuZDn2A2BmYN4fOhtcXic4jWMJX2J34Vubt6/gWjtJWkXsfuzEHl9BHRwl8DGayjyWbAeDfHGv43DMbD9xilXx4/MU3tXMzBolFxlRJiU7KkCE+WQgG+b96N+E4HKOVzGOYwBBR9are+Do7sTsHCM6OLLgwTp4HGLpbArreCwPN5TPOP7aC8R/J7V6fn7ZBzyWrsdmSZrBv09G+sKAWuyoDJv6ctDGnETWaeR1yE3wX+CVZCaJcgBXZHkcxFcHo7z4sE1mQ4YczrC8ZEU46V2Uolwekc3HwLG01Dcnm4pc4H8ElcLjQ== environment="SVN_ACCOUNT_NAME=emboss" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA45B2ZTLlmPsU9DowIhPQTQ7Rxn82bDY7CdQRiyMlViXb95vPXCNP1kTUA2luJjvWO/oz9t+IKDI5D8Dh2KWBGXQh5A9SAckq9R7PJIBrjB6atdYKQ6vHQNtvOxo3UE0Dmjjpv03Eg161Qs2x9ZoH/tblf68mgdklsa0ZfRu6oWfYl8KMdupbODrQNrL5jDVHGo4UhNvOvLy1yS9fLRc3GjFdRXPL7Ly5zBby64GFSHRmoBMCMffljWjrFpUZPMDTWw0zR2Xbs6AHmzZKpOSN6wA1rlZ4Tpx0giecOL53LKON0JRy5ldWMashKHU/c13oTw5kBPwm5hKzv5dxUBvEdQ== Martin.Bosslet@googlemail.com emboss environment="SVN_ACCOUNT_NAME=eightbitraptor" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDED3+ar71Fr/vNym15QRnWFHkcfSa58gtmER/3UTT2RsB0mAjbb2E8HgFejOW+dS3nnkXo26iw/i2rxNKiBmYiR7bVf8FNaqAYJ90OYVf9u+AASQj+M1WFJaEskl7QFm1+aXSArdDqBysvfGMWPES9AbhnzoGQkhqvQ9qCcYJOHJyIXP0rNk8ihJWstVRDC73oW+hGDi0cuAdIzazfQ1ci95OpeNKWKXTkwALBdI6tOJucoLu+fO2JiX+CqS+EqcJxipBioimN425SFcU31T3CclQUc53ZpMHSriMULoUOfYogJHXcVTh3i9oqIPIKPPOReAXPxcbu2mWfQGe6HJTTI+WaWH3ezh108OWnjGRbUymjaBuLSBSZfpB1yjEyKtN33Zu/eZs630ncrbFpPvoiTs9uAt10NzWEGAMPikJFz928HIJ4T87EwI21Tdb3CeZX+puv0rM0uZT4hejMImZyj6XfgfmEDJFtsbVquR7RLKkMy5TRnbdf/+3r98bv0Pc= mattvh@kyouko.localdomain +environment="SVN_ACCOUNT_NAME=eileencodes" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDifSqTn4IaJnI/qqcXn7iS2FlD5uwChlABuQzBpMohmjRWAva+bXFLgnEDslkc7M97F5LUf/6gI+oOUkBW91aKGUWKEAZ0335j7DjnHTMGWTW2E79zraB0RnKEKP8fT8//Qh0KC5WsEkjuiPgpxJkUoIO+2esTwHI16Zvtq0P5V+VI5eJsdVxt0ccsChcYcQNZPn/ikkRwqnLGM6u2/Nl9B0IbSoBGvvr89b1HqS9BvuWBeBYcdAIH0FGmuWjSFsxd/EPHuNnEl7n4JZEiPvo6tOnrAIYlprb8c6mdZ77fB2vZzdmoVHdQK0lEYcVAMiC9+YRXxJ9B8i0Zl77xH9TXdajMKggmfppQKblrGswN8NUu201J50Rac5ZR1QGND1qTVekuKizniLNAnXV0err3AEWGd1G3HkiRzh8Sbzxu8I8fyqscY1yiJNPt+aySuESF+rtKT4LNTCpgjIyZCu55SArt8+tcVzcjqf6zlnzPUiSSXfJz3r6CMpZjPEsKNT5pJpSbrjzv04pM1Xne60mSiyatXHgkmGoEhK21Femoiis3AGX9JqZQAiqAw9jew9j0tAvmYgdPqJnU+N7vekVPtBrVCUJjPvffjcBnvDE2cgBRphxbxitEiVjUWZkRMrEyzqYlKrjvnG3jd3kSU1hCwAnEfIKsqGX1oM/FRIU/qw== eileencodes@gmail.com environment="SVN_ACCOUNT_NAME=eregon" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAz/dEF7yeAjbZER9e/PYFg01OEZrHuW/NsFilFsM1v9rmSMW96MbOX1r1issMmND9HBaux0uPrZkEPH6Y8teg834SM0tftioVFM7Ei1ZC4otBnxAB1x91LSoiLKR/B+Yx+xsDOqOHKHhDOm08HZ0DI2gMsS0zOjHXvdYza8ZWj5qwnN0beqPw3jHwbc0OSBZH+QTIka1NPWsr+FlFkuvByFJxk3VsktzQOLKpmL+r77VCThqHTW5i+FI2VR0QFNUDzG/SAtK7YW3C6mjtRuqYd2markb6ACqejADQwJ5mDjGjymUSNUC2jGbg7eby4TdbP2ywgDFFxPRnbTMFinaznQ== benoitdaloze@Me-myself-2.local eregon environment="SVN_ACCOUNT_NAME=funny_falcon" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAxh112cwh5S5gASt1+wAO+fsZViAaAQQPQavD2rLrYEJii8HkQu7Cy/gl13Pwqoz2eSmxo59MYBMsV89WE4plAWwH6IM26V5AOcVP/7cBm/MFEfWjRBt4aAcjYnlqGyy+cOvyt0PvOxpiWKn7LvBCvFd0Lpf2HegSHZARMEnKjA/xQODs+ulOH0kS8aOMwZykIjiltK7KUFvskMojrCV+fR32kS9l5mTN2pgBlKIR5XJLrq4Hux6aNN/n56qPSgX6QAA4eL8owpyMSnxUs6QivHaiPVleCXl0rCOeH7BHkxzUp1Dq5OCc2JHT5K6m/Vw7b0RY5p23HSnuc4SFFc9ElQ== funny.falcon@gmail.com funny_falcon environment="SVN_ACCOUNT_NAME=git" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsDF1yrm9BOwgkzxLZsAOaVFjYVrjFkT6A8kWOKRdT2kImrOqD7r9EfxWvHpfZPh7BJ2cYGEWxxLOD1W8trO4DVm5MAnRZfxr9lX3wzbF7P2JQPBJlBzLGPsya/gG7xdpgbIwF7RSs07n1eA4YqjRv7MzcTKoOc5uCNeAxOnwh4W9gOEi/hEPKe0vKy3kCWKtTdeGx2yVMKIF1NvZlOW2MoacePDTtLqMQLnK5qywsvE7R8mWwyx2m1d+9o/YMCYHdVBbQ1mMDP1JoOc7NUDxnbsZT4ZnVzaWQuAE+wYkksuX0HbDz7PT52Y6CJ621m01QsDB3rKRZAd/85bo3GNvJ git@fluorine git From e9baf5ac882ad0e08c0385325ddcd2a59310a78b Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Tue, 8 Oct 2024 11:38:03 +0900 Subject: [PATCH 76/99] sync ruby/json --- cgi-bin/webhook.cgi | 1 + 1 file changed, 1 insertion(+) diff --git a/cgi-bin/webhook.cgi b/cgi-bin/webhook.cgi index 03dd3f5f..1918ff86 100755 --- a/cgi-bin/webhook.cgi +++ b/cgi-bin/webhook.cgi @@ -129,6 +129,7 @@ class PushHook win32ole yaml zlib + json ].map { |repo| "ruby/#{repo}" } + %w[ rubygems/rubygems ] From e0f2c6a265a061aa646ccb0e01e94187be4e2fc6 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 9 Oct 2024 14:14:46 +0900 Subject: [PATCH 77/99] Added win32-registry --- cgi-bin/webhook.cgi | 1 + 1 file changed, 1 insertion(+) diff --git a/cgi-bin/webhook.cgi b/cgi-bin/webhook.cgi index 1918ff86..2f43f83f 100755 --- a/cgi-bin/webhook.cgi +++ b/cgi-bin/webhook.cgi @@ -130,6 +130,7 @@ class PushHook yaml zlib json + win32-registry ].map { |repo| "ruby/#{repo}" } + %w[ rubygems/rubygems ] From 7af7ce6ee4c39cd49be5ec95cad4c85ecf3b28ea Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 16 Oct 2024 14:29:43 +0900 Subject: [PATCH 78/99] Removed bundled gems from sync targets --- cgi-bin/webhook.cgi | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/cgi-bin/webhook.cgi b/cgi-bin/webhook.cgi index 2f43f83f..60696eb5 100755 --- a/cgi-bin/webhook.cgi +++ b/cgi-bin/webhook.cgi @@ -64,16 +64,12 @@ end class PushHook DEFAULT_GEM_REPOS = %w[ - abbrev - base64 benchmark - bigdecimal cgi date delegate did_you_mean digest - drb English erb error_highlight @@ -82,18 +78,14 @@ class PushHook fileutils find forwardable - getoptlong io-console io-nonblock io-wait ipaddr irb logger - mutex_m net-http net-protocol - nkf - observer open-uri open3 openssl @@ -110,14 +102,12 @@ class PushHook readline-ext reline resolv - rinda securerandom set shellwords singleton stringio syntax_suggest - syslog tempfile time timeout From c051889b28dd5196c0f178aa2bfbdeb4c2341cb9 Mon Sep 17 00:00:00 2001 From: Misaki Shioi Date: Fri, 8 Nov 2024 12:53:58 +0900 Subject: [PATCH 79/99] Add shioimm's email address and SSH key --- config/email.yml | 2 ++ recipes/files/var/git/.ssh/authorized_keys | 1 + 2 files changed, 3 insertions(+) diff --git a/config/email.yml b/config/email.yml index dae560c7..51dc98ce 100644 --- a/config/email.yml +++ b/config/email.yml @@ -163,6 +163,8 @@ seki: - m_seki@mva.biglobe.ne.jp # ser # shigek +shioimm: + - shioi.mm@gmail.com shirosaki: - h.shirosaki@gmail.com shugo: diff --git a/recipes/files/var/git/.ssh/authorized_keys b/recipes/files/var/git/.ssh/authorized_keys index dee3cde9..c100f870 100644 --- a/recipes/files/var/git/.ssh/authorized_keys +++ b/recipes/files/var/git/.ssh/authorized_keys @@ -62,6 +62,7 @@ environment="SVN_ACCOUNT_NAME=rhe" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICLecn7rs environment="SVN_ACCOUNT_NAME=rhe" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfywbVpog+xdtZZM0Z6cG0tlutSgX9/nDwPIWav+qz0OMo9ZL36cay3drqkfFzcaknK4174slBBYZ1grVcSGT8b9zatAtKSP+AMQ7mcGC+zgSvxh621gENDZ2fdSgUmqIesMc0EHZfG9je6zaI3bkTlO1YLjdFNthQD2RVh4Ysei++5hnkrREB6P8k2/j54I0MVfgGlOZvzW+0Nh0Pp2hUItNSyzhPwvr4Gh+tWjnBF//XHiNfiqK+ZX2CO4U/lhhSmqLYPwOyfQ52nburUjjcFbpQ9f16vkeR+ejqeeQIBuk152s8uIhYy5clOcFr4/C66m5ZKHdkKK7/Wz9YorLL rhe environment="SVN_ACCOUNT_NAME=samuel" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPp5PNMkLwFHGXhjNTSAC5poU0bJclBm+4vIj9H/0Ovt samuel environment="SVN_ACCOUNT_NAME=schneems" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIItS5JtElgU0wUCrtGZyZD+ddRRkaKT1iqa4ofoRp+Eh richard.schneeman@gmail.com +environment="SVN_ACCOUNT_NAME=shioimm" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILJgduSUIo7r6dHniSXeNbvJPOwmkbkT3tH4DmI7nSz4 shioi.mm@gmail.com environment="SVN_ACCOUNT_NAME=shirosaki" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC64gticgEjTQcCOMNh7DnhiENLz54i14ityIZHB1nSd8pPVj1Ob5d1CB71A608a1GC2OmkgZrKqg5nf0EQJq5WEsOQLafaCpFwCTTycks+0IcQfDmrjTs/vexmwpXgRBhfVoUoEXbCTV+fi2YXR42wI8XSLI7tEKvU3x7hOjQxrNXTVSf2XzkDcwTOrHCCD5P2/J4zN75EXTzh9rJgC7ZpKXK+B7fQyb/g1swrDF6pOG3HysTitQuanT6WgCe4GVIdJquX3NiWmNZOSsc9HYCFdorKxlVBIVHQEExhd2hnDOk8FgXbH55hnWe0CeiSXpO+dC+N5DkhL/MzWjhDpKYL h.shirosaki@gmail.com shirosaki environment="SVN_ACCOUNT_NAME=shugo" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMFEvsplS/p+ldg4LW/azQNdaVg9WUiNw31EmpedTG+X shugo@lexington shugo environment="SVN_ACCOUNT_NAME=shyouhei" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIESbNNVHVIWwa4C1OgdF44f7WupoZgNpo1x+p1JkZldB shyouhei@ruby-lang.org @ 2016/02/22 shyouhei From 25ed7a4497463cd078f1fa8b78d0490258d515f7 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 22 Nov 2024 06:37:36 +0900 Subject: [PATCH 80/99] enabled ruby/mmtk sync --- cgi-bin/webhook.cgi | 1 + 1 file changed, 1 insertion(+) diff --git a/cgi-bin/webhook.cgi b/cgi-bin/webhook.cgi index 60696eb5..f76e8f3e 100755 --- a/cgi-bin/webhook.cgi +++ b/cgi-bin/webhook.cgi @@ -121,6 +121,7 @@ class PushHook zlib json win32-registry + mmtk ].map { |repo| "ruby/#{repo}" } + %w[ rubygems/rubygems ] From 809399156c38dcc47cab739f9e676468e412ae5f Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 18 Dec 2024 08:46:47 +0900 Subject: [PATCH 81/99] Disabled auto-sync for Ruby 3.4.0 release --- cgi-bin/webhook.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgi-bin/webhook.cgi b/cgi-bin/webhook.cgi index f76e8f3e..95a4a2c8 100755 --- a/cgi-bin/webhook.cgi +++ b/cgi-bin/webhook.cgi @@ -126,7 +126,7 @@ class PushHook rubygems/rubygems ] # Set false to stop sync before a release - DEFAULT_GEM_SYNC_ENABLED = true + DEFAULT_GEM_SYNC_ENABLED = false def initialize(logger:) @logger = logger From 029107b41ee2b3dcf523c4044d086c3577596336 Mon Sep 17 00:00:00 2001 From: ydah Date: Tue, 24 Dec 2024 14:02:41 +0900 Subject: [PATCH 82/99] Add ydah's email and SSH key --- config/email.yml | 2 ++ recipes/files/var/git/.ssh/authorized_keys | 1 + 2 files changed, 3 insertions(+) diff --git a/config/email.yml b/config/email.yml index 51dc98ce..9afedfce 100644 --- a/config/email.yml +++ b/config/email.yml @@ -210,6 +210,8 @@ watson1978: # wew # wyhaines # xibbar +ydah: + - t.yudai92@gmail.com yugui: - yugui@yugui.jp yui-knk: diff --git a/recipes/files/var/git/.ssh/authorized_keys b/recipes/files/var/git/.ssh/authorized_keys index c100f870..3e4793dc 100644 --- a/recipes/files/var/git/.ssh/authorized_keys +++ b/recipes/files/var/git/.ssh/authorized_keys @@ -80,6 +80,7 @@ environment="SVN_ACCOUNT_NAME=usa" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAxSL9or7Ae environment="SVN_ACCOUNT_NAME=usa" ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQBzfYV0T0BJwg9BJwXZ+FtrYWB8muU/iiZdY62C6yVC5k1iGpykNnOKA/AucuaH2pqFXtDEK8jmPyIqrlmEDD5tW6J55dvY8Ws7toFqjDMUw4KZD2WMd8YtkpuClwwis3vc0kqwX8M7XklJ2gwRtflW8YuXFBYhBa8Hxl1tRQLYXzu+HTt2F3is338B04GetylkamWJ9UlizBEusMciU/rYe6jtoF6FvEJdinQ4W4+7N/NhJyaLRVfkgRfbjfE6FEZUmjIH60ofFI1Oym84ePrx0AoUHrLJvhsCA95rCnLZu1mB3+mkTFEb2zliKwcq0ND8fEKgDILwdoqqjKBMm1c7 rsa-key-20100727 usa environment="SVN_ACCOUNT_NAME=watson1978" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQAbRtEjmYWCpEiEq4EtHuVAz4PE2fK6HmDhYo255Qp3vbA02I1Nv4VJCg1IwoPCqpCc1fTjqUSFOjBCYamLmODraeEhyLbs3lx/iBZtjhEFpIjjFno2+FC4ErsFCpkAPJlq19o8BV79NWhMYI1AhANr7pywLYzBYB51O0MrFdBZ2/iNEB7XnM3pcJhrTOTRUCpfoPJ1QmSm12+bAywOaeCUO0zfjpd1xd7DEZe5MLKFWKl0txqmNFJy8YnDfY5PPda5l8DAR1u5CMYCfTXvTOCinjE8YlD/6Nj2inKxHj/AWVpclyMXmg+EA3KQKb0xE0qLTw4A6jaWJuE/o+Wi+9 watson1978 environment="SVN_ACCOUNT_NAME=wyhaines" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1+GRY7ZSHqU8Q8PfE8zIerGUa66eKSLZ0D8rRbvKxnW5QhpxZ+8nVePtSSwH67WNuKJoBvbUmisl9N0LhGOFJt9R+1vxAp8jpXRKIPkiLkWkMgSU3BgqE0Q8d6vqo+fAhZjiNMPKHW1CAmx4rGgG6UFZsfB77J0r2wzBnJ149D44TOFsGJqLlVKC0AOqP4UnToeNzHThso5/LpKFNcR3Q7ZP5Qj5MmQPoa7PDz6lOKlHabSv1RHurYV79o5BgZKqtxcKHT+x83jgdaDMJYSrQKZb5h1lnOWax03fTqf4vwMOJtd08+GHXGy/Ci/pzOdU6b5ZMWeQSYToNetStBauJQ== wyhaines@kirk-hainess-macbook-pro.local wyhaines +environment="SVN_ACCOUNT_NAME=ydah" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDOv1OcrE/vYWwD28GTjX5j8cX4V6yxRuOyde0Cbbqsce0Dovi/BzrkWalJpRIFmP5M1BfyFilOrjL9fexjtAKyxbRBWNRnm4FTb1+cmxnGeHKBD9XwIeeaY9X/EF/s2yAC6lOP+f4S72xurbTGCrVvAFJP5+21EZSrvA8p/fbMCGZCbXBYXaRmfw8oj7C7Ruz6fS6IghDM8qibZjgtXvh1bk7Q+pLn2vizQq5L90QOOUOGyQDdWMNeFtjgOTGLm1Y8+Zq9IMeNjBXF2GP4gPk2cTXIS5d+pCJAW68Jx0QUOnxXIovO04KoK3YLhuy/PDYKGjcfwrVxZvp0+1hUeD38qM/ynsqcXxq68mCyXmRpwLG0iMR31s9LjWaYkjooWFXbnOAZzNQ0VGNYDISrBNBaXddkwnMczZAOmWTNMRJetOHP7RzpvG5wflFOUhBj+/mstf/33plOHfjEljHWE/fgGdFgJlhEOMjBSZjpUX8S7WoL49ZfOL5ntU1w5wTbwdM= ydah environment="SVN_ACCOUNT_NAME=yugui" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC1d1FfWAgzOdx4xSVwHmnAUlK2xqj1ck3rCBECW+t1p1QSQ9StKqq0U+ChUdHBnW3fm7KGLIXiwAysm55+5pvfyfvm+YrdyXwE0XPi2PreIAmHdsJj02EkKmcgJa+DcyRXzYsEmk3VBMCRWNkJTJRGRIqaTEZElCILmQ04/KCM4HgRtvgo5k5Ch/U6gC876h85EnFR91syXxBIZTeOcEIYJq89c5iZEWjWpmLqwEjcCWood6gcjX/b6jlx6jO90dydKHdNPRteh5fDWVPEl54/Qjio30iiHlN6DSarG7AQnOGzq6GHN1F1VDkDLMxGj8b1SwtitBL3HpBaLZYsN3v3hSwhmoPRWpjrZvtxurwedFZHQSHIjigZzGl48WUoWHIOUci9i/iHiHbOvcqPvgqA4vuu820G3SdfR7E0OwzKwqW4o7Z4QLZ+8Gk6KFhXjApUJCXIhhtKl1ucvrz6/e0Rar7Mi3qOKep52VSKYWi5z9f/7NAbkRAJffWBxclgchDzbal3hsaamLrPisjFdml3lQKQyfn2JgYzsYYdaD4izjKutPdgtojRLOTWE9B4dk1838v/wTsabST7qWxt4daBAOB9fRjLuJ0CIKJswAD054SiOdkyllU410iRLS6/lM4zkdD42+nKChhgYvQtcCzErbLhRUiCKWme0BxXFZ7kQw== yugui@yugui-macbookpro-3.local yugui environment="SVN_ACCOUNT_NAME=yui-knk" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3DwgGe2ZC2YBnMLXrncNYrzYkMpQ0CQJvfZj/I92dkXGQ5/7IwyYwMd/XH3fz58IGmYvnsLInnnlBXznCVubV8AH6fw3batpkiAq4AT7yf+Fql/OGn5VOQztxEzOc0LKqDn6WKPzlPvqixj+K3CboXItdURScsMJxwNhBS9WpXKZ9ZMF+BQqb8DddMMRSORNK3JWJBsUgYEJh4CZ00T7IF+xzI/LiQUDdrwzFYyRS1xuPge61LtU/nrNkzGyB4Jpxk4HfJLXsZ/E6B2F8sjDTvCl2AE5fzPzeP/fbnOVBTnGbYg3MZ35gELgIRvjMr6CQtV0derVWUh416M7H6iIv yui-knk environment="SVN_ACCOUNT_NAME=yuki" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCt1xemzgmUZBWDLFdyPhyJRtZpB5l8SNUiS8YpN0ao8FdZVstAHOxTU0kVce2m8yFtSKdImkso/5odjmbEtkc8GGA4fUtSYzye0yyvG6YFyMyc5WjoaBNUWokeY27VMdgp5oaxd4mVK6NVbVa0Q9VMiMoHUvnJUV8F051sXsmOgGzDjpSEUfnad/6J7josjJw7Dm3tuLd6sOzmWl6vB9pyflzgJ8vbP5UXuURl+ywZ/tYz9pM2s75q/pfpzDVmO2HnT2AMUirHt9lU+baAhRl8ZWYQEYt61veOc1aYUFEw3nGrxBIewwfMXEH427zbDlNkh6nJkWftrrmxg3BX8pcFtx5TxQDm/n1SaQyQRVGU+Vy+8yiJs6gFsu9WPxso5+8Lh6aYdRidu4+ZwhiuJ5Mmx0Isv5vSMaceY89Lo0znSzlkycgd3p7uecpT41rSqkxltuRO+aiaQRJhxRm1u9Pg5BtKMkSciGUOxwltrYVtYJExANXfBFRiSPn3qcbFhPtKCVH57X8WBHkSmxuDN4HqwX3k8NmRJxbvE25LFqXVnDzr1t2CZI8qZXHiATqZFCgax3Qe937RoZNDCpYDiZEJHZhSUKfI/JcYWAW0ZXk+J+uMtizY7oYyotT98ZMvOSQRU/hYVKrmEBpp1eM0BGDhJaH6g9VLzW7RdWeY2cjHYw== yuki From 46e63157b551626385641aeeac7696d3d8e8815c Mon Sep 17 00:00:00 2001 From: tompng Date: Tue, 24 Dec 2024 14:41:06 +0900 Subject: [PATCH 83/99] Add tompng's email address and SSH key --- config/email.yml | 2 ++ recipes/files/var/git/.ssh/authorized_keys | 1 + 2 files changed, 3 insertions(+) diff --git a/config/email.yml b/config/email.yml index 51dc98ce..e21b3ae8 100644 --- a/config/email.yml +++ b/config/email.yml @@ -195,6 +195,8 @@ tenderlove: - aaron.patterson@gmail.com - tenderlove@ruby-lang.org # tmm1 +tompng: + - tomoyapenguin@gmail.com # toyoshim # ts # ttate diff --git a/recipes/files/var/git/.ssh/authorized_keys b/recipes/files/var/git/.ssh/authorized_keys index c100f870..2eefff29 100644 --- a/recipes/files/var/git/.ssh/authorized_keys +++ b/recipes/files/var/git/.ssh/authorized_keys @@ -76,6 +76,7 @@ environment="SVN_ACCOUNT_NAME=takano32" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDI+ environment="SVN_ACCOUNT_NAME=tarui" ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAlC71NZNkGfGLVWL87fkcjIHFIKzabBlANf/rce0ElXABovvKx0DW0yNKvLEPTM8Y5OWE6R9mjRnXvLmdrWTs8YMVia4sFzkUAsHLU/UlYoZdVk3bIRr1PuoLRpqiCWNIl4Bu1p0m4m4LasHC/4Kz+VswVBtTixOgcyMPQz4+dm5jKVkrEMDWP3XElyAMCWaJ2k4hozJnlpCP/LOS4ActAZHVMjRgCxea9SRMgvSaAMtS9ZcyIXOZl0jj02vKGqEpRUh77NWXygy5uvgZD1Xi2m649TgcMfj+4mTsHf6/AZew6KZAiOV0K6lDvvK1wcDG4RaV8oLfL2tNHzhWc2AYQw== masaya tarui environment="SVN_ACCOUNT_NAME=tenderlove" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPZIZcyNtRMe1hLxNA9huQVIZVy1iKIN54lh7+f80WBm aaron@TC.local tenderlove environment="SVN_ACCOUNT_NAME=tmm1" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDRMxTKV1W0f6BrUWacQkCL/7f2E+QzN/jgcDeHJrznnNeKs9zYLjKUllpwVL8AqTaOCq4rV5g84TlZbnAVfY+8eGWVI5sMXk2TzbNu521+xrD1xFegzKAfOSXQsQx7tyR5aRmTJSfx5nWfsnng/jxFnCiGTuy+a7TxdnfZhdYqL66ltFLpD2grEgOtmcCIx9SF9WX2DZPz7vEabBbgp5+ZFNsl2ST/NcuqABNzdqnw/51CGavetsr/t2nR7mdgqKDWX9Xfh9bM0Pzzs9xSA82GnEW4X9KSGIMLgg2MSbFGRrCisPUSE1ynlv5e6jZ2Zgj0oILYGrxRHwGFbsaSMr9Z ruby@tmm1.net tmm1 +environment="SVN_ACCOUNT_NAME=tompng" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOerhB9Jkj3TXkuoMHp/7ztQbh0K38z2TT1PUd9mHusn tomoya.ishida@MacBook-Pro.local environment="SVN_ACCOUNT_NAME=usa" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAxSL9or7AewvAqq1pI6W0SKBN5RQA4t5sam9b1IxavJMzH0K8piCDSaBwW+E5Rr7Q85V4vHRGMoNTYCh34z4aR0DW1JRDfuzvdz2193FKWpWKbQhGdfZpRnb4YYdSf3YfvtEn6Q9l94W9abjp7ymH+Rznl7r5g8z6YxuHUtgrjKtMkBU1xGmtGGslTcC6cOSCCzPGTnpRDmriTzKE4h9THKbUMoUmzLRvzGVrDbMzLXmv6VojsIsTLbN6JsscfKTsjve2kB6k238hlQQAuRabjq1xRrHJW+37fqEGGKA7IQD5MEbW/iF4l3UbgUowk3yAAyDY8d7tjVKwiYVSaL5vzQ== nakamura@unigrate.co.jp usa environment="SVN_ACCOUNT_NAME=usa" ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQBzfYV0T0BJwg9BJwXZ+FtrYWB8muU/iiZdY62C6yVC5k1iGpykNnOKA/AucuaH2pqFXtDEK8jmPyIqrlmEDD5tW6J55dvY8Ws7toFqjDMUw4KZD2WMd8YtkpuClwwis3vc0kqwX8M7XklJ2gwRtflW8YuXFBYhBa8Hxl1tRQLYXzu+HTt2F3is338B04GetylkamWJ9UlizBEusMciU/rYe6jtoF6FvEJdinQ4W4+7N/NhJyaLRVfkgRfbjfE6FEZUmjIH60ofFI1Oym84ePrx0AoUHrLJvhsCA95rCnLZu1mB3+mkTFEb2zliKwcq0ND8fEKgDILwdoqqjKBMm1c7 rsa-key-20100727 usa environment="SVN_ACCOUNT_NAME=watson1978" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQAbRtEjmYWCpEiEq4EtHuVAz4PE2fK6HmDhYo255Qp3vbA02I1Nv4VJCg1IwoPCqpCc1fTjqUSFOjBCYamLmODraeEhyLbs3lx/iBZtjhEFpIjjFno2+FC4ErsFCpkAPJlq19o8BV79NWhMYI1AhANr7pywLYzBYB51O0MrFdBZ2/iNEB7XnM3pcJhrTOTRUCpfoPJ1QmSm12+bAywOaeCUO0zfjpd1xd7DEZe5MLKFWKl0txqmNFJy8YnDfY5PPda5l8DAR1u5CMYCfTXvTOCinjE8YlD/6Nj2inKxHj/AWVpclyMXmg+EA3KQKb0xE0qLTw4A6jaWJuE/o+Wi+9 watson1978 From 9450819840f3c00702a587182ed213aa5c9086b9 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 25 Dec 2024 19:01:16 +0900 Subject: [PATCH 84/99] Enable auto-sync for default gems again --- cgi-bin/webhook.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgi-bin/webhook.cgi b/cgi-bin/webhook.cgi index 95a4a2c8..f76e8f3e 100755 --- a/cgi-bin/webhook.cgi +++ b/cgi-bin/webhook.cgi @@ -126,7 +126,7 @@ class PushHook rubygems/rubygems ] # Set false to stop sync before a release - DEFAULT_GEM_SYNC_ENABLED = false + DEFAULT_GEM_SYNC_ENABLED = true def initialize(logger:) @logger = logger From b714a870b97a792ba8549c165451c7c02c80dd5e Mon Sep 17 00:00:00 2001 From: Kevin Newton Date: Sat, 11 Jan 2025 20:02:17 -0500 Subject: [PATCH 85/99] Update kddnewton SSH key --- recipes/files/var/git/.ssh/authorized_keys | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/files/var/git/.ssh/authorized_keys b/recipes/files/var/git/.ssh/authorized_keys index d2386bcb..173c58a7 100644 --- a/recipes/files/var/git/.ssh/authorized_keys +++ b/recipes/files/var/git/.ssh/authorized_keys @@ -29,7 +29,7 @@ environment="SVN_ACCOUNT_NAME=k0kubun" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDT environment="SVN_ACCOUNT_NAME=kanemoto" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAt1/3mzBCtD2v1sIqBxvvqPOefd6jvUrEDzDYoXgW5tRieV+UmdQC+HZGeNURzl6CwiwLR6wHziyOyREsJtsMtdHiAk7A0pbaOVT9sLAc01gHYB3k6eXxt7ybB+BdOsHgEtgJUvI8JTF+E26IlfM44GYJbhlL4aEcFEdZPXkolLLWY5+qXe2rizPz/bt9vnc4b720AfQC74JrtRalbCGPawLcV7y4smLE+kRjmzS5o5rbBe6kgyZ2n9X6IguPz+Fzy6YLzEiRL7uD834WK4rD5vXPQTSiXiO3apGZSu9q+MDi4cGTp2eXzyFsTHOFebKGfjCUfcDqgrtjfCTj3f5pXw== kanemoto@miggy kanemoto environment="SVN_ACCOUNT_NAME=katei" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIezAMzVD8CSCNQR1mnvyWxg8AcHn3wJ2Yoj9YPhHl6t environment="SVN_ACCOUNT_NAME=kazu" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILpK0tF51R1sMBfYpLNNogDQEVuM1twtKPlH93EI/q+/ kazu@elk kazu -environment="SVN_ACCOUNT_NAME=kddnewton" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPQjbEaL2YCM6YTlExHKVCzVNqTkVkOBtfe91yxs9hsi kddnewton@gmail.com +environment="SVN_ACCOUNT_NAME=kddnewton" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM/AuoRT838IRLsNvGpOBoRofcWkBR8fsxE7GSZiwLnm kddnewton@gmail.com environment="SVN_ACCOUNT_NAME=keiju" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDYvH6am51Z2FGccAc4sEGkN7OpNQhtb6/91bxBRgLyShHxmYUxH24oSycDv7CIoKzIxQih08o92FUxmrIK4LmhULW7vZNm83cMS7bIaZNPYVURaLzz7xKmUc49o6HZFAsMPPg3OFvdPVT+QEpAFujZ00X9sPK6zpsd/xnhj6qyAXfw0oZqNtXpTz50aSZTPn8D+GAWZb4fbZ+danOJZpUN7YwELvybpinbFj+nOxJKFrjZ+mRLhiABuiJ26oNA7kOKE3tMdPjii9qDnFpUjDkDxGYjxryU207oT90iizKd/2joVi69NuOTY6mTDf1hlqOTlRqBORw7va1remBRy9BvEL+T+dikJHu6B8qU++8pBUAGkT4tebfOveLdE5/+fasJ++/1H/M25fSMAbDNgsJS3EnTaw4A2XchFH6SC+6DluJHWMnm3Z1w7IOlEURzBpcVpYgALRjY+coijfz8TEIgSwiwUWLUSztXgILoO7eKXjGnOPHEeWl/HQFJlE3GosxpWj7dq8p8FQKodSdf5WXRk3m4tS2oy2r0odjURHqXQASdPxvrF+KF/FopwmWzazj23MDBP/zrOeU0oqyHjtTL8LExBuDcm3JnrSKdHxlWI2czZrpZW+pa50ykSC8f60KiJGnjSyR1Lz4kjwxuE9yLqSd4gTHr9iJk9+u3fhcgkQ== keiju@ishitsuka.com keiju environment="SVN_ACCOUNT_NAME=kjtsanaktsidis" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMFmr90xpvG/6fJ1L1g+fg+2J7eZgOTcT3MTVvEfcvvx environment="SVN_ACCOUNT_NAME=kjtsanaktsidis" ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBA+yrdwdfxsfBHyZbMhbPS5j2owyD3uNUMrQFbbNQOpiysKXAhCWfwOPuCsSZojKcsHXgc3CLk3tgPzO4cPUVNI= From 8688c04fdef1575a0362226246cf61b62b53faae Mon Sep 17 00:00:00 2001 From: zzak Date: Wed, 5 Mar 2025 07:11:53 +0900 Subject: [PATCH 86/99] add zzak ed25519 public key --- recipes/files/var/git/.ssh/authorized_keys | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/files/var/git/.ssh/authorized_keys b/recipes/files/var/git/.ssh/authorized_keys index 173c58a7..fda26dbb 100644 --- a/recipes/files/var/git/.ssh/authorized_keys +++ b/recipes/files/var/git/.ssh/authorized_keys @@ -90,3 +90,4 @@ environment="SVN_ACCOUNT_NAME=zverok" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7IT environment="SVN_ACCOUNT_NAME=zzak" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCZXuyimZ/XjSqv6+DC4b+IV69gG7fCV4etLQirgMFgicrYd1/tHcLjIjw05htD5ekmEG2m0O4B4CsYozXoES5BjXNp9DZhxHXqr1mtnsZORrNoUCSRBjbf+bDwENERWVSitgJGr2IbrWTu0p/wF7xI9QC4HURZY6mGLA8uKbvirzJPfSxFs9KW7iebwH4eNnuhKaEr/1xmVMabJYkrxFPEAQXo6J2/y9Cf1kht9c35lbvFgiv2TQN77s6PcNnjVWwC26tlqkk99WfOSozIDhqbAQbOlRHwxZFtjuq5IuTfXvrW5LAqVAjEN/Srq594zUUhoFvrNjHRC4GT8t9ZLYWr zzak environment="SVN_ACCOUNT_NAME=zzak" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCobWytkJx0fT/I+zUKJgLArBj6cMIuTrp+/M3eG0OW6t1otHiFh2UcuYLTtsEdXd0lWkiW5Orry5aCX6EdbxZMIxI1iSnBa9oGvkW7A4z5ovtYpJnB8cthGRdK1/OzSoDQKwOfJh+ZAXUNpPlLV45jmTEfW4ASAaQRCjSfbIT+L0MP1QZ3DwHDqUGD6I3i0NTVkZR4NGy+HZshEJ1G34zbPnzjfchabA/pErRmVfJLTnJjo2u0sdGSFiUo+oyJMBxovvcWIoi6VwPilvBOWncqyk1s+u2gO5VCYgwIwILi/+K/+dxI28VDRRC1hxzCVMYQvUP4gejpUoaVhdxDuEVX zzak environment="SVN_ACCOUNT_NAME=zzak" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDZEy6AHBBku8KpoKjKIhwlc9p3ReTRRyL4O1kstGfi4vxXJQNYhrlor/2ckg/M8jBm7iqfBnRz50yreC/POeCgp0Ziy4K+vfMJmz9pDWjk1j1Kl8qwPertrruTNhebv0pyvPqOTLehNw7gsmSqtxyMuXcvkhFtK9iQJBZqwjTle30Dpi2SQUo6CF+BQHdsh56YD1KVUXmLnesUSW41GA8cTTQ98NA+77NACRZfRkahXyFuGEHQ+UEZ7z6qM8Mj3WRr1wqmTYI9IFOocHBbkDfr5qBxkGuBmL/lgiUaA7VqK0xdqssRJ1Sw2b2XnFKTFgjD4F1PpFe+B3LZ8JXH5Cr5 zzak +environment="SVN_ACCOUNT_NAME=zzak" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA+irWX53zoF1cDEoFhv8sWqBKd7SGbkExRM+OL/AUHj zzakscott@gmail.com From 7ec6ff72ac9037bf618dce18d4529de2e7104088 Mon Sep 17 00:00:00 2001 From: zzak Date: Wed, 5 Mar 2025 08:10:21 +0900 Subject: [PATCH 87/99] Remove outdated keys --- recipes/files/var/git/.ssh/authorized_keys | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipes/files/var/git/.ssh/authorized_keys b/recipes/files/var/git/.ssh/authorized_keys index fda26dbb..126e0592 100644 --- a/recipes/files/var/git/.ssh/authorized_keys +++ b/recipes/files/var/git/.ssh/authorized_keys @@ -87,7 +87,4 @@ environment="SVN_ACCOUNT_NAME=yui-knk" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3D environment="SVN_ACCOUNT_NAME=yuki" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCt1xemzgmUZBWDLFdyPhyJRtZpB5l8SNUiS8YpN0ao8FdZVstAHOxTU0kVce2m8yFtSKdImkso/5odjmbEtkc8GGA4fUtSYzye0yyvG6YFyMyc5WjoaBNUWokeY27VMdgp5oaxd4mVK6NVbVa0Q9VMiMoHUvnJUV8F051sXsmOgGzDjpSEUfnad/6J7josjJw7Dm3tuLd6sOzmWl6vB9pyflzgJ8vbP5UXuURl+ywZ/tYz9pM2s75q/pfpzDVmO2HnT2AMUirHt9lU+baAhRl8ZWYQEYt61veOc1aYUFEw3nGrxBIewwfMXEH427zbDlNkh6nJkWftrrmxg3BX8pcFtx5TxQDm/n1SaQyQRVGU+Vy+8yiJs6gFsu9WPxso5+8Lh6aYdRidu4+ZwhiuJ5Mmx0Isv5vSMaceY89Lo0znSzlkycgd3p7uecpT41rSqkxltuRO+aiaQRJhxRm1u9Pg5BtKMkSciGUOxwltrYVtYJExANXfBFRiSPn3qcbFhPtKCVH57X8WBHkSmxuDN4HqwX3k8NmRJxbvE25LFqXVnDzr1t2CZI8qZXHiATqZFCgax3Qe937RoZNDCpYDiZEJHZhSUKfI/JcYWAW0ZXk+J+uMtizY7oYyotT98ZMvOSQRU/hYVKrmEBpp1eM0BGDhJaH6g9VLzW7RdWeY2cjHYw== yuki environment="SVN_ACCOUNT_NAME=zenspider" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINIZa3bSbmVRBeYUuZ5stuV5WdsrYRvVq0/NFNBME9JY ryan@zenspider.com zenspider environment="SVN_ACCOUNT_NAME=zverok" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7ITHa70oSy3Zl/EyVuzpjM8weDjloRxj/Ld4U3TFe3y9eEgejCvK6sBcaXxC3bkq1LyIQCSv09Mg++/fuYKG+kUc/8lJoSwSUmSUoOVxZ7FIx24pOb2GCnY6hwEQ18bUc56JUSoaZ1N4d/u25nCemJ9Bh+viZjKIcE+a5f9QRir4cAwpb5D19mOEg0buvOmy10QHfkEq7387bqdl63bEQ5UMHh8aFntrgFG83Zy7CJofg2RPEnQt7CpL51N4Bt7emeUZn2s+fSP2BpCZ7YE9ATwkOo971B0Gdv5djYGZDgQESSXUSW0/qNxto20gQ7zfusyFXq3xpKnsG0KxH6twx zverok@meerka -environment="SVN_ACCOUNT_NAME=zzak" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCZXuyimZ/XjSqv6+DC4b+IV69gG7fCV4etLQirgMFgicrYd1/tHcLjIjw05htD5ekmEG2m0O4B4CsYozXoES5BjXNp9DZhxHXqr1mtnsZORrNoUCSRBjbf+bDwENERWVSitgJGr2IbrWTu0p/wF7xI9QC4HURZY6mGLA8uKbvirzJPfSxFs9KW7iebwH4eNnuhKaEr/1xmVMabJYkrxFPEAQXo6J2/y9Cf1kht9c35lbvFgiv2TQN77s6PcNnjVWwC26tlqkk99WfOSozIDhqbAQbOlRHwxZFtjuq5IuTfXvrW5LAqVAjEN/Srq594zUUhoFvrNjHRC4GT8t9ZLYWr zzak -environment="SVN_ACCOUNT_NAME=zzak" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCobWytkJx0fT/I+zUKJgLArBj6cMIuTrp+/M3eG0OW6t1otHiFh2UcuYLTtsEdXd0lWkiW5Orry5aCX6EdbxZMIxI1iSnBa9oGvkW7A4z5ovtYpJnB8cthGRdK1/OzSoDQKwOfJh+ZAXUNpPlLV45jmTEfW4ASAaQRCjSfbIT+L0MP1QZ3DwHDqUGD6I3i0NTVkZR4NGy+HZshEJ1G34zbPnzjfchabA/pErRmVfJLTnJjo2u0sdGSFiUo+oyJMBxovvcWIoi6VwPilvBOWncqyk1s+u2gO5VCYgwIwILi/+K/+dxI28VDRRC1hxzCVMYQvUP4gejpUoaVhdxDuEVX zzak -environment="SVN_ACCOUNT_NAME=zzak" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDZEy6AHBBku8KpoKjKIhwlc9p3ReTRRyL4O1kstGfi4vxXJQNYhrlor/2ckg/M8jBm7iqfBnRz50yreC/POeCgp0Ziy4K+vfMJmz9pDWjk1j1Kl8qwPertrruTNhebv0pyvPqOTLehNw7gsmSqtxyMuXcvkhFtK9iQJBZqwjTle30Dpi2SQUo6CF+BQHdsh56YD1KVUXmLnesUSW41GA8cTTQ98NA+77NACRZfRkahXyFuGEHQ+UEZ7z6qM8Mj3WRr1wqmTYI9IFOocHBbkDfr5qBxkGuBmL/lgiUaA7VqK0xdqssRJ1Sw2b2XnFKTFgjD4F1PpFe+B3LZ8JXH5Cr5 zzak environment="SVN_ACCOUNT_NAME=zzak" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA+irWX53zoF1cDEoFhv8sWqBKd7SGbkExRM+OL/AUHj zzakscott@gmail.com From 5bf53d67666632f1d136260723d897443fc2ba72 Mon Sep 17 00:00:00 2001 From: zzak Date: Mon, 10 Mar 2025 12:22:30 +0900 Subject: [PATCH 88/99] Add zzak@hey.com backup --- config/email.yml | 1 + recipes/files/var/git/.ssh/authorized_keys | 1 + 2 files changed, 2 insertions(+) diff --git a/config/email.yml b/config/email.yml index bdc84b76..90c8d906 100644 --- a/config/email.yml +++ b/config/email.yml @@ -229,4 +229,5 @@ zverok: - zverok.offline@gmail.com - zverok@ruby-lang.org zzak: + - zzak@hey.com - zzakscott@gmail.com diff --git a/recipes/files/var/git/.ssh/authorized_keys b/recipes/files/var/git/.ssh/authorized_keys index 126e0592..9861a288 100644 --- a/recipes/files/var/git/.ssh/authorized_keys +++ b/recipes/files/var/git/.ssh/authorized_keys @@ -87,4 +87,5 @@ environment="SVN_ACCOUNT_NAME=yui-knk" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3D environment="SVN_ACCOUNT_NAME=yuki" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCt1xemzgmUZBWDLFdyPhyJRtZpB5l8SNUiS8YpN0ao8FdZVstAHOxTU0kVce2m8yFtSKdImkso/5odjmbEtkc8GGA4fUtSYzye0yyvG6YFyMyc5WjoaBNUWokeY27VMdgp5oaxd4mVK6NVbVa0Q9VMiMoHUvnJUV8F051sXsmOgGzDjpSEUfnad/6J7josjJw7Dm3tuLd6sOzmWl6vB9pyflzgJ8vbP5UXuURl+ywZ/tYz9pM2s75q/pfpzDVmO2HnT2AMUirHt9lU+baAhRl8ZWYQEYt61veOc1aYUFEw3nGrxBIewwfMXEH427zbDlNkh6nJkWftrrmxg3BX8pcFtx5TxQDm/n1SaQyQRVGU+Vy+8yiJs6gFsu9WPxso5+8Lh6aYdRidu4+ZwhiuJ5Mmx0Isv5vSMaceY89Lo0znSzlkycgd3p7uecpT41rSqkxltuRO+aiaQRJhxRm1u9Pg5BtKMkSciGUOxwltrYVtYJExANXfBFRiSPn3qcbFhPtKCVH57X8WBHkSmxuDN4HqwX3k8NmRJxbvE25LFqXVnDzr1t2CZI8qZXHiATqZFCgax3Qe937RoZNDCpYDiZEJHZhSUKfI/JcYWAW0ZXk+J+uMtizY7oYyotT98ZMvOSQRU/hYVKrmEBpp1eM0BGDhJaH6g9VLzW7RdWeY2cjHYw== yuki environment="SVN_ACCOUNT_NAME=zenspider" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINIZa3bSbmVRBeYUuZ5stuV5WdsrYRvVq0/NFNBME9JY ryan@zenspider.com zenspider environment="SVN_ACCOUNT_NAME=zverok" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7ITHa70oSy3Zl/EyVuzpjM8weDjloRxj/Ld4U3TFe3y9eEgejCvK6sBcaXxC3bkq1LyIQCSv09Mg++/fuYKG+kUc/8lJoSwSUmSUoOVxZ7FIx24pOb2GCnY6hwEQ18bUc56JUSoaZ1N4d/u25nCemJ9Bh+viZjKIcE+a5f9QRir4cAwpb5D19mOEg0buvOmy10QHfkEq7387bqdl63bEQ5UMHh8aFntrgFG83Zy7CJofg2RPEnQt7CpL51N4Bt7emeUZn2s+fSP2BpCZ7YE9ATwkOo971B0Gdv5djYGZDgQESSXUSW0/qNxto20gQ7zfusyFXq3xpKnsG0KxH6twx zverok@meerka +environment="SVN_ACCOUNT_NAME=zzak" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOcOu+yKll8JYcuiTPFenDtshwwgAXz8pueTlahru0QI zzak@hey.com environment="SVN_ACCOUNT_NAME=zzak" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA+irWX53zoF1cDEoFhv8sWqBKd7SGbkExRM+OL/AUHj zzakscott@gmail.com From e95b342954781f65b12d21742380854299ba01ad Mon Sep 17 00:00:00 2001 From: Mari Imaizumi Date: Mon, 17 Mar 2025 14:16:15 +0900 Subject: [PATCH 89/99] Add ima1zumi's email address and SSH key --- config/email.yml | 2 ++ recipes/files/var/git/.ssh/authorized_keys | 1 + 2 files changed, 3 insertions(+) diff --git a/config/email.yml b/config/email.yml index bdc84b76..b3977eab 100644 --- a/config/email.yml +++ b/config/email.yml @@ -66,6 +66,8 @@ headius: # hone hsbt: - hsbt@ruby-lang.org +ima1zumi: + - mariimaizumi5@gmail.com # iwamatsu jaruga: - jaruga@ruby-lang.org diff --git a/recipes/files/var/git/.ssh/authorized_keys b/recipes/files/var/git/.ssh/authorized_keys index 126e0592..7398f5ff 100644 --- a/recipes/files/var/git/.ssh/authorized_keys +++ b/recipes/files/var/git/.ssh/authorized_keys @@ -19,6 +19,7 @@ environment="SVN_ACCOUNT_NAME=gogotanaka" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQ environment="SVN_ACCOUNT_NAME=headius" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0T4mlsgQS+etyEjxj7lec25FjLxtSwfDH0nToUqolOuyyhgeDj+SJprJDH3b4QudSGY/VRj7wiQKs3NgqkDnCfNCJEjmqPkChcvwzV4FTJCik0JgxflxZ1Q+oEKrYu2txCfb50HHQs/hY2Symm+3de019RxB+HSU7MIG5srQNHSabrF0ZhDSS31bdkA1ZPG5pseKpQomi/yj/npLSWy9sA84owkGgDfVLq5KMozHpE6lQ08yFxMEEb7Wi+TtVUs4E8chIt53tX12qiDgvZIMvZtS1mZ9XazlmH7SpYktCkBAuz+RihnBLNzT7rxUA89sB6hyCSh3MW7f9yI01bNW7Q== headius@charles-nutters-computer.local headius environment="SVN_ACCOUNT_NAME=hone" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0zVL7SWnhhN/gayRXUTvg30YNtDZACniAqgcq0xwmYgL6Mzh7lT8gY7wXWJyY9Kud40PaU1U9mB2WUjh9n1AgRCL/AZDDJrWUIvyMDkumxmi3PUvptHCmKYhXx7Ji2CKIQuRR5kRtKaPj+9GZVtk+52IKOTvQqcvUdWScp1zeXQ+tlwp1+K24Ge3TSdAGXaoOVUMWsQLY0oaO+WfNd+IFuHeQsSssh3rKSeHaFSCkPynQxce1TD75wAb/AmcX65d6FuwnyAjyvmEQPaEGp/KN0niDE79SVrTR65+cw9q10ApDN1AxN2FSt9EE04pHyTJ35vT+IXlM8rEoO0wi/R99w== hone@hone-laptop hone environment="SVN_ACCOUNT_NAME=hsbt" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK9soM0r82SN3fO4MVhPs9Q1OCYThuR9POvbhnP1HNph hsbt@euler +environment="SVN_ACCOUNT_NAME=ima1zumi" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM6e/yGhpuKG5uUhL7OjnGuWpkOJqa1lH7WuyhlanT/h mariimaizumi5@gmail.com environment="SVN_ACCOUNT_NAME=jaruga" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDGFd9NkGTvgHAue9sy/HbO76m9pSnRm9UngCX98NBXTjZN1GyS4I+jF/uONIWiS0Iv4ruHTxlsleIg3j9meZBS95VhdLdV8yojLIwpog9cPBSlIo20lPy+cAeBb3zaVIYHbnn3oAVALoHsix91RorJSdANNTi98SNkrtz0l7OyH01B17EM+wg9RDyONY/wKQh/d9nu1iHrO8rjCJKyU29rJCOALH9mwohdVNHJhJj/VOoLZKvLgjGetPOuBJgk5F4uVtCYpiJS/Sq9qPVCAadN6bwXHFIodIz4ku5MYryhhOCV3V4u3YRIAzZSB1mF+VShIimK+o5qxmoD/0H/BlutELOqJuplY2ssUpzjKhZJeGeXeXk6Cg4j3Wsf3BJZYaDypzekSVn8TIEOYJzDtv1Dm3+ZOROJ/egbL4pQP+EoAO2aIAhMneRtMlpwSctRvK5C5bLJm1Z+6AfQY3fnfrzft3y0K7YJWHq8V5hUKn+r2RhzgBDKx1tcxoobmE31nQ1HiW80TpQlKpR4K1KnGKnkuQu4pe/YJKLW9vodQoMIGOJ51v0DOd6OB2VlZpn6RBHpN4oeLuEVsWinq/VcppCXeF0cqmvB3nTOCwn3oHOCQgN/UT3Np9Mh9CUWXE+wN1vqqBFEPscAXobYlp2IgF9dZ7tY2xuEdGY0qBouM7zlmQ== jaruga@localhost.localdomain environment="SVN_ACCOUNT_NAME=jemma" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCzWMlqqr350ltszjfA9MtXYRnChJflxYPw3sSITBbgbrqGytzzWkIKadlYa2tHYGgbEmz1FqHIQoR9mW2QXCgBdI3awO8rsWxLc5af4Uweb+2Qo0+4BBJ9Ke+rYJuV4QGYy0jsK0r/aJhxQhvanOPSdGacXGqns2R9mSsIotFOUI+ToAVXxGeI1YeDcnEj/281rWXGFJcwpyXzH2h8199oWb5gbR6qFJZD4OkEbY+Ym1uwTwdwaV/jLoLo1VAnPq5y9Y8+AoahvPqwGX8R2bfAXFNgQ8J/owFIynuSR6Dtr57Rkn5sjV3vP5cmkfh5obdILzTylWAXZxzINRBq9/eloydjJgwpJWGJLPwSSVOew9us2G+Sjq+zvprjo+JTJum82FUnUi0dNoFQAFapBdpPkUBZZNgTkzrkZHuuon/wnDiLuUJFrAJVaZCOm98G6HoTqOXrv/9pG2tawhMU9qXQX1aAVIB7GpGjZuBPAspwYgnds8vQmaw8QZJvkDngjCk+Lef9A00ZjfHVtfnGPi+TVloOLk/hjgfcX7KRTSAM4gUtU8Tjlg2nr9gtAMTPDWeaRNa9u66qkq5/Eeh4dab2eL3V7lL5Y9gw0S3Kdx8yq77l1tYQlOQgpCw04UpYbY0U+edUU8Z9JZ3z9OukheCVz/pgvfimbYozFA0x9/631w== jemma environment="SVN_ACCOUNT_NAME=jeremy" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE1s0ie7GIiU3kIhB6Pb0LH5Ljdb3oqCLE9Je08M40c3 jeremy@speedstar.jeremyevans.local From c477d690e13c8144ca61df8ba1cc81553561d8d6 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Tue, 18 Mar 2025 10:43:12 +0900 Subject: [PATCH 90/99] Use Ruby 3.2 --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index 6a81b4c8..406ebcbd 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.8 +3.2.7 From 35b367319d51d9bcf9e687a1ac08415f6a786458 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Tue, 18 Mar 2025 12:14:30 +0900 Subject: [PATCH 91/99] Revoke incomplete/inconsistency accounts for git.ruby-lang.org --- config/email.yml | 20 ++++++-------------- recipes/files/var/git/.ssh/authorized_keys | 13 ------------- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/config/email.yml b/config/email.yml index b3977eab..20ddcfbc 100644 --- a/config/email.yml +++ b/config/email.yml @@ -32,13 +32,10 @@ byroot: # dave # davidflanagan # dblack -drbrain: - - drbrain@segment7.net - - drbrain@ruby-lang.org +# drbrain duerst: - duerst@it.aoyama.ac.jp -eban: - - eban@os.rim.or.jp +# eban # emboss eightbitraptor: - eightbitraptor@ruby-lang.org @@ -55,9 +52,7 @@ git: glass: - glass.saga@gmail.com # gogotanaka -gotoken: - - gotoken@gmail.com - - gotoken@notwork.org +# gotoken # gotoyuzo # gsinclair # H_Konishi @@ -161,8 +156,7 @@ samuel: - samuel.williams@oriontransfer.co.nz schneems: - richard.schneeman@gmail.com -seki: - - m_seki@mva.biglobe.ne.jp +# seki # ser # shigek shioimm: @@ -182,8 +176,7 @@ soutaro: - matsumoto@soutaro.com stomar: - sto.mar@web.de -suke: - - masaki.suketa@nifty.ne.jp +# suke tadd: - tad.a.digger@gmail.com - tadd@ruby-lang.org @@ -205,8 +198,7 @@ tompng: # uema2 usa: - usa@ruby-lang.org -wanabe: - - s.wanabe@gmail.com +# wanabe watson1978: - watson1978@gmail.com # wakou diff --git a/recipes/files/var/git/.ssh/authorized_keys b/recipes/files/var/git/.ssh/authorized_keys index 7398f5ff..9392c5d0 100644 --- a/recipes/files/var/git/.ssh/authorized_keys +++ b/recipes/files/var/git/.ssh/authorized_keys @@ -5,19 +5,13 @@ environment="SVN_ACCOUNT_NAME=aycabta" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDGj environment="SVN_ACCOUNT_NAME=ayumin" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAzSzkZpCW9Seiw4cK7UP7BfTnhRsTk/adqdsb0qKYAYJEhMWOhFcNGbNgFUR5mVMycRQIEBnQrSpoGRBjH4/Q1dORORR078laXyY0otfzJp/OtKBw9SAE3m1y9ogcs6hbhKiinLl7y8eKVW7vczfS0Y/1WdyFtYyRnzk8twotgkb9W2CVUDvA9ECAlH1HvTR4CnlUHIM55xEnM5vwIR6pUMTYdU0vf0KGmsIxjjGsyRRr5e52Tqewmat0ypmiOIat2fjQc3Si5ubHZHrsQaBeupRjtsjsu7GYjKPr8985OJA+wZjeRxR5DeRrNAb7pa1pENPHdYnSoz6kvsNWAxhRkw== ayumin environment="SVN_ACCOUNT_NAME=burdettelamar" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC09YYLe9VMHQyI4m/1OtlxIysWweE9L1zumH9JAWi/SQssuKWtfJL9aqT5ZMoZF7PNNeRNHUDgrMJyc+iKwRQdKTWG+mqO+6qLDnjy+C2CrqZ8YGTfUZ6mlX8UwSUF01Lz0GbX2e0KBQp52FB00sfw35M1ha0yQGOMPnfdMMBvZw0t0UV1GkGqsVOIm+8zusPeii9LuPHekHczRknqocSinOWEEkIAu5t72X6hhTEUpsWcVJ+XCtUJGEZjlb6lOICcRbLYbE68EGWiozpJ3IbOJ6C+46HG4H7yuILrVkE7R6esdHnLhEJcGibqRvCNxMDW2j6CXONQZIpVzTyBf9Cz burdettelamar@ruby-lang.org environment="SVN_ACCOUNT_NAME=byroot" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD3xtb4T4A6sMxgpiXNID2WogA795Gwqw8FttJeTqKFke8ZTuBad5A14aHXIKsIH0QwbGlluNn11HzUGemHsJoxtgbaP5QKNY2fyhM/LCXzje1U3qjIGKfN1QVJCEK94ofnb+Ao9dmDQFWkGElKFtLcoLF7Za8qGwtWp08b9cAZSaX2gokIo57kO/5BirKfizZKn1zxGH//a/7gQ0DBytKRrVVZBH9CbD6sFyAXbhvoBFcLij5KgYWUNkIPtauzhSU3Q7xXDSZEXjy9efH2HRxj0pLLJqk/VhMxMW7E7fMz4DAVn7x56TVjwxwpOBBg3L89X3WqOZN3XJhwSa+modsR byroot -environment="SVN_ACCOUNT_NAME=charliesome" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAyKzQzk3TZWPzIXbl/uL1AfA4W1GVI23/16JGb3b1T+z13KSqdw1tNg6siQOUTRzrOBSeQ8ZzdWqvi5Vs/K4SVJZKVi+KQiI5FMBPXyM3iTgJf6cnKAeVA8oUTabkwHWDjYuY4tQqgxXHtHavK3RYgcykKVkGb1mceUGGaKSR/QjLLo9yqFOh2Q+cU3CJae1Sq1/tS9swAq2+zV5no28itXIMUhAMcu9ntjtXp4hF/qc5jHdbipuCO8E35p4Xs4iTIhlY0X+PAcdtA44o8F06C1CtEhvMlN3ZcB9+EQYdmimmWzqYXhma37qppl27Vq0HpejKYuqcJd3ILPVh4mzBUw== charlie@Charlie-Somervilles-Mac-Pro.local charliesome -environment="SVN_ACCOUNT_NAME=dblack" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAyFAfqqmBeGb3j07q9u7GN8nIPqgPz+xFkJT3RS+b/nT9OHLOy3pOM5q20/50Y8mAYVqw9+J9RWQwFPFZdEw/DExuI+dfzzkPPsJN1DBWRhWae4N8dOh3kLOG4GLEvMw5r88B5EW4VisGdP0tD/KpQuDaTTPY7wx6f10JgtCH+1/JP4NJ6/ww+iVbf+O6DoKZE8q1G2LNm8Q0i39SwRbUd1UaKda9zd45ERod089XPZcHCvVoFc3+4JMy97Rvg5EcvidH6XTclXXqvfaOqggOz/SgLgWSwzp5gMo5kjCNdaaWNroYAPmhsriQV9Ge46jMc8M2URAGCyQjBU7ri1pBaw== dblack@david-blacks-macbook.local dblack environment="SVN_ACCOUNT_NAME=duerst" ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAj3xR5x6inzlL8Ot6eVvPB1fmIp05LHR0Ga6PuZDn2A2BmYN4fOhtcXic4jWMJX2J34Vubt6/gWjtJWkXsfuzEHl9BHRwl8DGayjyWbAeDfHGv43DMbD9xilXx4/MU3tXMzBolFxlRJiU7KkCE+WQgG+b96N+E4HKOVzGOYwBBR9are+Do7sTsHCM6OLLgwTp4HGLpbArreCwPN5TPOP7aC8R/J7V6fn7ZBzyWrsdmSZrBv09G+sKAWuyoDJv6ctDGnETWaeR1yE3wX+CVZCaJcgBXZHkcxFcHo7z4sE1mQ4YczrC8ZEU46V2Uolwekc3HwLG01Dcnm4pc4H8ElcLjQ== -environment="SVN_ACCOUNT_NAME=emboss" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA45B2ZTLlmPsU9DowIhPQTQ7Rxn82bDY7CdQRiyMlViXb95vPXCNP1kTUA2luJjvWO/oz9t+IKDI5D8Dh2KWBGXQh5A9SAckq9R7PJIBrjB6atdYKQ6vHQNtvOxo3UE0Dmjjpv03Eg161Qs2x9ZoH/tblf68mgdklsa0ZfRu6oWfYl8KMdupbODrQNrL5jDVHGo4UhNvOvLy1yS9fLRc3GjFdRXPL7Ly5zBby64GFSHRmoBMCMffljWjrFpUZPMDTWw0zR2Xbs6AHmzZKpOSN6wA1rlZ4Tpx0giecOL53LKON0JRy5ldWMashKHU/c13oTw5kBPwm5hKzv5dxUBvEdQ== Martin.Bosslet@googlemail.com emboss environment="SVN_ACCOUNT_NAME=eightbitraptor" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDED3+ar71Fr/vNym15QRnWFHkcfSa58gtmER/3UTT2RsB0mAjbb2E8HgFejOW+dS3nnkXo26iw/i2rxNKiBmYiR7bVf8FNaqAYJ90OYVf9u+AASQj+M1WFJaEskl7QFm1+aXSArdDqBysvfGMWPES9AbhnzoGQkhqvQ9qCcYJOHJyIXP0rNk8ihJWstVRDC73oW+hGDi0cuAdIzazfQ1ci95OpeNKWKXTkwALBdI6tOJucoLu+fO2JiX+CqS+EqcJxipBioimN425SFcU31T3CclQUc53ZpMHSriMULoUOfYogJHXcVTh3i9oqIPIKPPOReAXPxcbu2mWfQGe6HJTTI+WaWH3ezh108OWnjGRbUymjaBuLSBSZfpB1yjEyKtN33Zu/eZs630ncrbFpPvoiTs9uAt10NzWEGAMPikJFz928HIJ4T87EwI21Tdb3CeZX+puv0rM0uZT4hejMImZyj6XfgfmEDJFtsbVquR7RLKkMy5TRnbdf/+3r98bv0Pc= mattvh@kyouko.localdomain environment="SVN_ACCOUNT_NAME=eileencodes" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDifSqTn4IaJnI/qqcXn7iS2FlD5uwChlABuQzBpMohmjRWAva+bXFLgnEDslkc7M97F5LUf/6gI+oOUkBW91aKGUWKEAZ0335j7DjnHTMGWTW2E79zraB0RnKEKP8fT8//Qh0KC5WsEkjuiPgpxJkUoIO+2esTwHI16Zvtq0P5V+VI5eJsdVxt0ccsChcYcQNZPn/ikkRwqnLGM6u2/Nl9B0IbSoBGvvr89b1HqS9BvuWBeBYcdAIH0FGmuWjSFsxd/EPHuNnEl7n4JZEiPvo6tOnrAIYlprb8c6mdZ77fB2vZzdmoVHdQK0lEYcVAMiC9+YRXxJ9B8i0Zl77xH9TXdajMKggmfppQKblrGswN8NUu201J50Rac5ZR1QGND1qTVekuKizniLNAnXV0err3AEWGd1G3HkiRzh8Sbzxu8I8fyqscY1yiJNPt+aySuESF+rtKT4LNTCpgjIyZCu55SArt8+tcVzcjqf6zlnzPUiSSXfJz3r6CMpZjPEsKNT5pJpSbrjzv04pM1Xne60mSiyatXHgkmGoEhK21Femoiis3AGX9JqZQAiqAw9jew9j0tAvmYgdPqJnU+N7vekVPtBrVCUJjPvffjcBnvDE2cgBRphxbxitEiVjUWZkRMrEyzqYlKrjvnG3jd3kSU1hCwAnEfIKsqGX1oM/FRIU/qw== eileencodes@gmail.com environment="SVN_ACCOUNT_NAME=eregon" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAz/dEF7yeAjbZER9e/PYFg01OEZrHuW/NsFilFsM1v9rmSMW96MbOX1r1issMmND9HBaux0uPrZkEPH6Y8teg834SM0tftioVFM7Ei1ZC4otBnxAB1x91LSoiLKR/B+Yx+xsDOqOHKHhDOm08HZ0DI2gMsS0zOjHXvdYza8ZWj5qwnN0beqPw3jHwbc0OSBZH+QTIka1NPWsr+FlFkuvByFJxk3VsktzQOLKpmL+r77VCThqHTW5i+FI2VR0QFNUDzG/SAtK7YW3C6mjtRuqYd2markb6ACqejADQwJ5mDjGjymUSNUC2jGbg7eby4TdbP2ywgDFFxPRnbTMFinaznQ== benoitdaloze@Me-myself-2.local eregon -environment="SVN_ACCOUNT_NAME=funny_falcon" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAxh112cwh5S5gASt1+wAO+fsZViAaAQQPQavD2rLrYEJii8HkQu7Cy/gl13Pwqoz2eSmxo59MYBMsV89WE4plAWwH6IM26V5AOcVP/7cBm/MFEfWjRBt4aAcjYnlqGyy+cOvyt0PvOxpiWKn7LvBCvFd0Lpf2HegSHZARMEnKjA/xQODs+ulOH0kS8aOMwZykIjiltK7KUFvskMojrCV+fR32kS9l5mTN2pgBlKIR5XJLrq4Hux6aNN/n56qPSgX6QAA4eL8owpyMSnxUs6QivHaiPVleCXl0rCOeH7BHkxzUp1Dq5OCc2JHT5K6m/Vw7b0RY5p23HSnuc4SFFc9ElQ== funny.falcon@gmail.com funny_falcon environment="SVN_ACCOUNT_NAME=git" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsDF1yrm9BOwgkzxLZsAOaVFjYVrjFkT6A8kWOKRdT2kImrOqD7r9EfxWvHpfZPh7BJ2cYGEWxxLOD1W8trO4DVm5MAnRZfxr9lX3wzbF7P2JQPBJlBzLGPsya/gG7xdpgbIwF7RSs07n1eA4YqjRv7MzcTKoOc5uCNeAxOnwh4W9gOEi/hEPKe0vKy3kCWKtTdeGx2yVMKIF1NvZlOW2MoacePDTtLqMQLnK5qywsvE7R8mWwyx2m1d+9o/YMCYHdVBbQ1mMDP1JoOc7NUDxnbsZT4ZnVzaWQuAE+wYkksuX0HbDz7PT52Y6CJ621m01QsDB3rKRZAd/85bo3GNvJ git@fluorine git environment="SVN_ACCOUNT_NAME=glass" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEApHGP4iV3a7vAEO1m8nDQsnxCFiCFVdWPuJuohA5DDgQkRD4ydCIVKIF1HuycHdY5KFE8BQ4aeZ3PvdPPC0o38rCOSVom2dLKrQNmqL02c92dfRP7MOCBIp2PMMz0tDkjXQI6aJsUmkVHTRpPych3KbA/Vn529l6Y3bs6I8CrWhUr7iqHxFPjPFJEZwRiLFH7oAzRWX5eWuXGGXmpwP1kYrWtte8YygAvM0eUyekuf4q9zu0Z7FmkJabU3CTx5OCoUWzY4hlG8P3cApCHPkMW81bod5SX7RsoqFIGJSq4kma71PBS8zCBYrYgVRWxM4jVtfOuV0eYVXgm/1oDoE+x9O9EAjOXWBbvtsrVb0ieWb8NNjr78HwPoRepvIJSJRDHdRrZD8UMA/Gy+6lzYoFNmX7TSaYu2x/9LYUu25ZVW4+8mHSYmyDFt+qZurehIov4zLvzhX726T/WsZx0Nnfwjd4X3t7TNiK9y0A8HuMbpvahvHrpn8rr8NCsq7uoHWYNhbV+4YkAi2AW9Hfjp9E+t9UQ03sjNu9MR+Km9irK0HWxdnzdSBNtJbGZSeKTM0F+Q5x9v7QaTbPwjHSte3Fuz8cGVQsF+t1vC+jp+dpSov4U+hZ/rBD+PtWr3pNKXdzPdoKj8acfH/tO40Fu0xzsi4ci+68va1/esZdQbEadsgM= glass.saga@gmail.com glass -environment="SVN_ACCOUNT_NAME=gogotanaka" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDHNS8EEbBljyI/C77Zm0m2RmBVu7UoAQp9RaxtY1I+ktPfGCF3s70j6U+BnEXLo9S8bHB4T1lmtZXkQVza/AiZkPJ2nlzgDrpnyhtfN/vPvYp+wNeQI9XAJgzL5TahN7055dLjS1MjGeUMrbut7nnNyZ9fWIv0rRoUFfZxSSlsSIr2qW6BFD8pzxa2iZS281BHEh/zNN65qJ5QMc0YeuM3vFHC8fKSflK3Sq2XQUcmCEIEchLkFriexIC0sPSZ2AOgucjaJw2l+FGUhYV5g/qrzM7Wl3oFPldFovfUEhqkaXFqiHsDfr+uzDLi0BD/k9imB/3TaP/JDa1Pb397On9j qlli.illb@gmail.com gogotanaka environment="SVN_ACCOUNT_NAME=headius" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0T4mlsgQS+etyEjxj7lec25FjLxtSwfDH0nToUqolOuyyhgeDj+SJprJDH3b4QudSGY/VRj7wiQKs3NgqkDnCfNCJEjmqPkChcvwzV4FTJCik0JgxflxZ1Q+oEKrYu2txCfb50HHQs/hY2Symm+3de019RxB+HSU7MIG5srQNHSabrF0ZhDSS31bdkA1ZPG5pseKpQomi/yj/npLSWy9sA84owkGgDfVLq5KMozHpE6lQ08yFxMEEb7Wi+TtVUs4E8chIt53tX12qiDgvZIMvZtS1mZ9XazlmH7SpYktCkBAuz+RihnBLNzT7rxUA89sB6hyCSh3MW7f9yI01bNW7Q== headius@charles-nutters-computer.local headius -environment="SVN_ACCOUNT_NAME=hone" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0zVL7SWnhhN/gayRXUTvg30YNtDZACniAqgcq0xwmYgL6Mzh7lT8gY7wXWJyY9Kud40PaU1U9mB2WUjh9n1AgRCL/AZDDJrWUIvyMDkumxmi3PUvptHCmKYhXx7Ji2CKIQuRR5kRtKaPj+9GZVtk+52IKOTvQqcvUdWScp1zeXQ+tlwp1+K24Ge3TSdAGXaoOVUMWsQLY0oaO+WfNd+IFuHeQsSssh3rKSeHaFSCkPynQxce1TD75wAb/AmcX65d6FuwnyAjyvmEQPaEGp/KN0niDE79SVrTR65+cw9q10ApDN1AxN2FSt9EE04pHyTJ35vT+IXlM8rEoO0wi/R99w== hone@hone-laptop hone environment="SVN_ACCOUNT_NAME=hsbt" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK9soM0r82SN3fO4MVhPs9Q1OCYThuR9POvbhnP1HNph hsbt@euler environment="SVN_ACCOUNT_NAME=ima1zumi" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM6e/yGhpuKG5uUhL7OjnGuWpkOJqa1lH7WuyhlanT/h mariimaizumi5@gmail.com environment="SVN_ACCOUNT_NAME=jaruga" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDGFd9NkGTvgHAue9sy/HbO76m9pSnRm9UngCX98NBXTjZN1GyS4I+jF/uONIWiS0Iv4ruHTxlsleIg3j9meZBS95VhdLdV8yojLIwpog9cPBSlIo20lPy+cAeBb3zaVIYHbnn3oAVALoHsix91RorJSdANNTi98SNkrtz0l7OyH01B17EM+wg9RDyONY/wKQh/d9nu1iHrO8rjCJKyU29rJCOALH9mwohdVNHJhJj/VOoLZKvLgjGetPOuBJgk5F4uVtCYpiJS/Sq9qPVCAadN6bwXHFIodIz4ku5MYryhhOCV3V4u3YRIAzZSB1mF+VShIimK+o5qxmoD/0H/BlutELOqJuplY2ssUpzjKhZJeGeXeXk6Cg4j3Wsf3BJZYaDypzekSVn8TIEOYJzDtv1Dm3+ZOROJ/egbL4pQP+EoAO2aIAhMneRtMlpwSctRvK5C5bLJm1Z+6AfQY3fnfrzft3y0K7YJWHq8V5hUKn+r2RhzgBDKx1tcxoobmE31nQ1HiW80TpQlKpR4K1KnGKnkuQu4pe/YJKLW9vodQoMIGOJ51v0DOd6OB2VlZpn6RBHpN4oeLuEVsWinq/VcppCXeF0cqmvB3nTOCwn3oHOCQgN/UT3Np9Mh9CUWXE+wN1vqqBFEPscAXobYlp2IgF9dZ7tY2xuEdGY0qBouM7zlmQ== jaruga@localhost.localdomain @@ -27,17 +21,14 @@ environment="SVN_ACCOUNT_NAME=jeremy" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAwcDSfi environment="SVN_ACCOUNT_NAME=jhawthorn" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ4FsiavriYpm9GKVP2TEztHxnzwiYRosx7fWI5LN3cl environment="SVN_ACCOUNT_NAME=k0kubun" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN1UcvTB/sH5hdIaPvH7lgixOB0APaeAOMlyRwrq6NqS environment="SVN_ACCOUNT_NAME=k0kubun" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDTBqmCx8FUX01dLomDUhE+El33VsKMpDF7aTj2p05NKrlUmIfLD0BKkVUP1yLlJpDZsz83oogjlH5XZl4q7AvH4PNCbIiUuXxDeJevo5hDpqDaaBSDiDU0WRF82sng1bDrLCjXVXsXQ/nQLS7PsWFyBIlunnRHSO91NnZwhxxJgp9K89a0tFpTn/koRuW6b8om++1UtoY8+rjIC11qtj9G1hj78rqeJmNtWdoJsIG5qcjNl/DikJBhTLenAOTwK1BzhHdo0doTdZzal+6koE9fZ/lv8DvAciJr8IDIdHd73XJKFlm7GcOZ3EO/1N9JUbNHDCd+dWFolTqWghxa9Dr -environment="SVN_ACCOUNT_NAME=kanemoto" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAt1/3mzBCtD2v1sIqBxvvqPOefd6jvUrEDzDYoXgW5tRieV+UmdQC+HZGeNURzl6CwiwLR6wHziyOyREsJtsMtdHiAk7A0pbaOVT9sLAc01gHYB3k6eXxt7ybB+BdOsHgEtgJUvI8JTF+E26IlfM44GYJbhlL4aEcFEdZPXkolLLWY5+qXe2rizPz/bt9vnc4b720AfQC74JrtRalbCGPawLcV7y4smLE+kRjmzS5o5rbBe6kgyZ2n9X6IguPz+Fzy6YLzEiRL7uD834WK4rD5vXPQTSiXiO3apGZSu9q+MDi4cGTp2eXzyFsTHOFebKGfjCUfcDqgrtjfCTj3f5pXw== kanemoto@miggy kanemoto environment="SVN_ACCOUNT_NAME=katei" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIezAMzVD8CSCNQR1mnvyWxg8AcHn3wJ2Yoj9YPhHl6t environment="SVN_ACCOUNT_NAME=kazu" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILpK0tF51R1sMBfYpLNNogDQEVuM1twtKPlH93EI/q+/ kazu@elk kazu environment="SVN_ACCOUNT_NAME=kddnewton" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM/AuoRT838IRLsNvGpOBoRofcWkBR8fsxE7GSZiwLnm kddnewton@gmail.com -environment="SVN_ACCOUNT_NAME=keiju" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDYvH6am51Z2FGccAc4sEGkN7OpNQhtb6/91bxBRgLyShHxmYUxH24oSycDv7CIoKzIxQih08o92FUxmrIK4LmhULW7vZNm83cMS7bIaZNPYVURaLzz7xKmUc49o6HZFAsMPPg3OFvdPVT+QEpAFujZ00X9sPK6zpsd/xnhj6qyAXfw0oZqNtXpTz50aSZTPn8D+GAWZb4fbZ+danOJZpUN7YwELvybpinbFj+nOxJKFrjZ+mRLhiABuiJ26oNA7kOKE3tMdPjii9qDnFpUjDkDxGYjxryU207oT90iizKd/2joVi69NuOTY6mTDf1hlqOTlRqBORw7va1remBRy9BvEL+T+dikJHu6B8qU++8pBUAGkT4tebfOveLdE5/+fasJ++/1H/M25fSMAbDNgsJS3EnTaw4A2XchFH6SC+6DluJHWMnm3Z1w7IOlEURzBpcVpYgALRjY+coijfz8TEIgSwiwUWLUSztXgILoO7eKXjGnOPHEeWl/HQFJlE3GosxpWj7dq8p8FQKodSdf5WXRk3m4tS2oy2r0odjURHqXQASdPxvrF+KF/FopwmWzazj23MDBP/zrOeU0oqyHjtTL8LExBuDcm3JnrSKdHxlWI2czZrpZW+pa50ykSC8f60KiJGnjSyR1Lz4kjwxuE9yLqSd4gTHr9iJk9+u3fhcgkQ== keiju@ishitsuka.com keiju environment="SVN_ACCOUNT_NAME=kjtsanaktsidis" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMFmr90xpvG/6fJ1L1g+fg+2J7eZgOTcT3MTVvEfcvvx environment="SVN_ACCOUNT_NAME=kjtsanaktsidis" ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBA+yrdwdfxsfBHyZbMhbPS5j2owyD3uNUMrQFbbNQOpiysKXAhCWfwOPuCsSZojKcsHXgc3CLk3tgPzO4cPUVNI= environment="SVN_ACCOUNT_NAME=knu" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINNlg0z5+X9xuNP4jQczfNFv81OLuSP9nvQgtPvrmk7q knu@ruby-lang.org environment="SVN_ACCOUNT_NAME=ko1" ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAnmC8r8/DbTKflE/TU9KHOOTutlPkg9WFs7LDeJMOPpxX51r0wFgBUB5k5/lN7itozgEX4Hgz4lN0ao3FDOdSkLYtcG/u0nrr8fthra9tKiU09u9GmZAmqk+Vw0Ldj7JPX69b2jiHfF02ObQlgKerk3+XRVTXd7Ao02J9gDx97D7sJXXi/Cdy4T3h4T37zOR56p83E9VKFXg89tJbNLKoQiWEWX5cQdqcA+JgyyxcMdaGbmK41jxos2W6Ud0A69gXBhouvbBVrALEpSUb/5uvR+bk3uFNJ0AewfyPJpgIBPWtAPf00V2lxK0wbUJb9aN9i5rMuaal5KgoirpLREHKNw== for NaCl Servers ko1 environment="SVN_ACCOUNT_NAME=kosaki" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMi26qZaTy6S5IUnZT+YXjKrPIkWNMrnMmwTIBROo7aK kosaki@vm-32cpu -environment="SVN_ACCOUNT_NAME=kosako" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAoY7v1wJY8Aho2+mbUCzRjWUFZu0/YxiCaL7QlRYOy5zdsMwhkePOGpc6sWBAAUKjQoCoApM1Z5M9UC7UaNDyn7GAGqEx64LlN2YUp5nPaF147c9if6ncmVdONxN28YC8ie42TR+p8BGrf4oKxbqx7+Y9Ot8QAI+AS5oJMyCZ3+906mhPAphzg0NOnpn8BB53aQgZxuiK4Rq8L8EnpTZNRGOcgR2nKhfOeRSPz8UmSkK4Ug0AJDum3O6RMDTz8jNlGZopnzyj7xM2hGT6lT/7d2lgDsZQ4/OglsvrSTgib6f+11OMbk9EKE3HheeQ7mA1xcJI2YQLFAujxBktA+LiNw== kosako@zero kosako environment="SVN_ACCOUNT_NAME=kou" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAnyNhU/qmDpE2ZrHa+1yXepFbesvBpv2Ltol3ryb15l8zxOPXPwQaQ4vX8ynp0SFqJzG2GZ8S4BtDJ7jl3FSiyaIYa+jvAdDzqWk8LVrGJwNMGq2iDmYi531bk5pqS33UaKG9oIYaV71biiTx3meoJP3AmCnvFvz9ZoZKqYVGOulRtE0bZqB0IsxyzOMfhHqH3I6UJjsPqqXcgSFNhVRcE1U3fYSU9WajBtyaI6eRO3ccIemDPZOQTI+KIkyagp6DXj/dksxxxaQ185s3CLI6y5FXyw5c15n5R8vAvDYAXEZGltvLFiBiH1fdSWnQVD9Vj9RWHBkIFcMehMkFwpIM5w== kou environment="SVN_ACCOUNT_NAME=ktsj" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAx+Kf9Sy1fwEUNqQvG/LUw2XvjRfoMt+eL9D+cgVe5QgSqPbBWNMqxpAUcpQW5rRCdlPWHLynjU9B1Pd9Bq3Vwh9y8c91p1li9YJzz93oHdoSbFJb2XSdxeLyyXOavw+pdO/JCcJoP0bZBATPzSnuVD2GTHjj3+wXhWbUdwBacabXT4+rmNa54t1u/lXX5yHKHlpEpUGpKWO5FdfB5lwfRCNKHv+LrDf2zBgQVyYWTggHTeA6M79FOzqOW8gINi54qHndMhBPHlcZz5yqMUTKqDMEL/z/rMRP/mvKTpezDAOFB1hE+vMHIIT4ccTcyGPPUEz41w6+8K2rFdfb1qv/ow== kazuki@callcc.net ktsj environment="SVN_ACCOUNT_NAME=makenowjust" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDM+bKE+CkZJcQXjP4gArifrJkYCTOXDBlvYI6S36e7B9RFOTGqYoHz/PQFmcXyzlQZRR38+t0KOliGkhhTBT6mVIT6VDHYN3a4RHngiZQeQhx/u2DkBduEbhE4AdKcSaKpBuGiuyFa2OXbRPMnVY2iuUsnFlWlyESz2nw+5FbkXT8dCzaly9Z3257BEf++GPM5ojwOul1u/J6coxIbuWq4lgUmyuvPi6kxIEvoiDZqMk4IgpqPpAvSXIs9YVdeK3fZKTfvNX2PMn6oZ7CEQJ4iiJpbKsjLjQIbGFl2VOR58X4Qp6cf3cDwZJ3KlYTp2eePfkr0qhc4/u+yzdawgKHUwZmKKxidLtWrxU60FgMoUTYNTrXUfK929YF+zjmpnBE9iZUNTUk7dy4gvuGaah/KMhsaD0QPu+NptHfKCp06J8BhxFTmJ7+KZjFlBMAojp3MEWToP2AlOP/AXV9yIDpdrTET1eDjb1fDYDXvVgunkbqtyYdbbT61NgxZpyiQ4IdnGWyR52vq0M7UJTCWyOycj1Bd5LxppSSaNjnENsi//2xAdqteB+sPpPNIfTMPDQwfXaClk6JU6U2tZTBPQUv2QxMKhlzMGlIL4yNZkgiV7GIugnLZC/HjI2qZxFyPPXn+9U8M4KhUDMapwMX8wNoaHiVtruKgsRHXeDtP9ayolw== makenowjust@KitsunenoMacBook-Pro.local @@ -68,20 +59,16 @@ environment="SVN_ACCOUNT_NAME=shirosaki" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC environment="SVN_ACCOUNT_NAME=shugo" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMFEvsplS/p+ldg4LW/azQNdaVg9WUiNw31EmpedTG+X shugo@lexington shugo environment="SVN_ACCOUNT_NAME=shyouhei" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIESbNNVHVIWwa4C1OgdF44f7WupoZgNpo1x+p1JkZldB shyouhei@ruby-lang.org @ 2016/02/22 shyouhei environment="SVN_ACCOUNT_NAME=shyouhei" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvtovqw1WKVmN0pVYKfrZNwhpcUZmzI/ZaQBDZfRnhVc7fQHThJUdR8mSyIGOBnwBTqB88x6crBDwfmdVvPXfMLV/BfOBObv/T1DpUgmo7oO1RIqITpcYvh0cpy4B4bWPAnSC1JH4nOCeHI58+N4CqNZGAghZBZn0rwiX+GzuVy/YrWS8B1nXyaj9t4sIT1PJY9udzQqZe6vvH/SeMCfvMfx2oQXqMawMQ9STPI6d72qJpZY2xPbY1TWsunXED7WxQetMXbIZCoU+Y45/Irrq2NzAFsUaWxP7Od1ggsfmpYRTUHgRmxJH+Ci8yoQO28/A/HSpFuY6qDgWt4HRrhps1w== ci.ruby-lang.org <-> github.com gateway shyouhei -environment="SVN_ACCOUNT_NAME=sonots" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCqPJFB76djfmh1q30MBhoOgNwhwEQdXfcm6Cm6/wH9pLpefFeaLDc+Cg3hVex/tY4bAdeYndAxa2YJs/CVCPjrpgqmqBEskU/3/JyVLgLsPlUZu0ZCCR4iy/snJffQ0IfLcg+eToPGOWxK7y9BSapbUmQ0Thrwj6DxKZV+dxkCgAfsJWKNJkrH981W+SB6mc8k4L+y225285f5vSceheoiF4sF7yFw6t4fAiY44+waNL7qP0Xn1+Dn/noLqQjIj4YvzmXtqHr2XV93bzJnJAP5H3IRI3O8elBiJwiX59w+qIR+xCNY2GZhugUkNR0aA9E+YyYtSAWeGRJVPAKL9KKt sonots environment="SVN_ACCOUNT_NAME=sorah" ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBACG1cKNR8SS4Dkm2wcia74RRmy9d7h62114MQd0H9zb1+1LxVa55Qqd8O232BH1i/fF/1o+eE3L5U7RCR8KUCuAXgFrF429BETaiiBnSErv5yrHJS5RTTjEhA1d9Ygk0o3Und6+90waBXAk2oPVP+OBNtYq1CraZQsXuqvlUtMrBnSTsQ== sorah-mulberry-ecdsa sorah environment="SVN_ACCOUNT_NAME=soutaro" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGz4u/OYdvmxPAseh6LDPE3Sp+D3NONJYoEHthFoD5ADpYbCvofzi/mbFFn7BP0MnSklRoMWqBAcfmMPswswNo9+S1m98jNfLbvpwmq3elDTGvkf6GSQ49gEGZdXVInsCQmTgp0W7IIj4/Y0NBDRMzMI3BObpPC76g9dbsRZUdSrSaNW++tRAc/vYZl3UeQo12SgkYRedE5ve1jYVVqdPINZ+Qpq87qUqNrho8OON+hAg4IllnFqVC/opM6+iGFT1Z8Q67hkvxTjFk072r1epskNmbK3rdXPxVIM+NySCj8jTYtSzMAAoIOPH6a6c78a7pzn6adoRmy9/TnFP7goIj environment="SVN_ACCOUNT_NAME=stomar" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDkdyOaVR4r4Rb1ELKEoZMQzxWIKoMEd/nAc0iiP44OJGWiDAQf9RxPaciiwiscP4RfYOOTJc+gZjxluPso/mqibGXd2VBW3+CWGcLEk7uBScZtTb50m//eg+dZHDzzkda7/o1ZelwprG8RSrCs2NAneIyPgMzdElV9V1963KeDzuex0uEL1MG8a+H7IC9rVl80QNl4J37DHQtaqcOQ4nY3qKOTOKBIPosf5ScAVeGmAG1ekL8I9NI8gQYPtxXwPVBgncmd6O6so4CBx0zO8Q+nmE2wwMCRrg06pPKggSPKstwId0LnFW3XoHGaAX69wQxv9b/C5FsRrMtXPnKD6o15zcTFN+Rvnwp3tQwnLEwn2/CzjF07ctxY9wzL+Phs0jAoa/BcR6WoQg4vrh2ZKpgmvkNtLT1wxQGvm4Yoq0K+coPxpmXs5jT5c+Ws9V9raG7H6IeR3DrPMCxd500F+DsbEW3In7zSQ55QuyYpO7vYWBBHyvGQq70yiwCFEjAwfCGlSbrZY4qdPR6/4V3q1Y8BQRIqAWUg/LEyIY4Gw1XXJ27vdfqBI6YIfNeegL+boWh6qaKpWJ12jcc7RakQEM+yIFjDN+VeAsuxhyGC9ZKhp2x4qUir7GlDGKyOpIZNXIiyLNzqau7Oi9qbToYHrY8Tvk/HsBx9pac5r82f5Skl0w== stomar@ruby-lang.org stomar environment="SVN_ACCOUNT_NAME=tadd" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCdJXwiupBUJihQtx2m2Nmt88t3iWFx6542lT987zRm0XMNVqUG1lxFZs/hZutyagr12juhCoHD6nRoKR2QjfqnQwD4PZIzRWXzRvenZcEkSghJrMu7QQsR/6GsDbWrTmW5TWy72IscehLR3A0fcHxgiT454r5vudN3rXdY5BmS6gUumKaqVAyNiRirev0uOWOr/IClt14LcID+CVbSWuP3Qv+p4FRmPBlGIgD7rdVcI/Vyf5KCUDPQ+5nHyMGcp0rPQ9tbCvng8MSFGwokYU8AwWxux0haH1XMKKZ5Nk2Xh2lEvgPtubOEd/oNCB/mhCFXZw6vr38d11qzMMM1RdbbajHERB2t87UIjvBtJ2SfIsJSFv+BCG09xfXjqiGmtCA7obTIEomM0AEOSaY76UB4WPNHVm9i7TNKZQAouokuOvB4c30hpd1D/VOYkTH1fP3Pv9UlBNNj4EomFz+gvnh0uwLJ3GdZLrcQjdrSsFfgs5/wlB81rjqz1aDLHYNGpTYZw+CqTeG6JMgf+JyiSg49t7JCp9wVXytaFoAIDD8/fUl0VCiOPo701yTeZbIyInjl7s024GFitGrTYRWTRb3AaeZ+G+9IlYQPKKWeIa16paVJHSXi9BoT5rhhIGKx7f9ysR9dHEQR4clGJQJVVXqDisW4GZxiZwqJNJgFw20Q6Q== tadd environment="SVN_ACCOUNT_NAME=takano32" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDI+cB9tLV++KbpGN7K5dv+3lgWqSinnvvjAYn3QW4Pf takano32@gmail.com -environment="SVN_ACCOUNT_NAME=tarui" ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAlC71NZNkGfGLVWL87fkcjIHFIKzabBlANf/rce0ElXABovvKx0DW0yNKvLEPTM8Y5OWE6R9mjRnXvLmdrWTs8YMVia4sFzkUAsHLU/UlYoZdVk3bIRr1PuoLRpqiCWNIl4Bu1p0m4m4LasHC/4Kz+VswVBtTixOgcyMPQz4+dm5jKVkrEMDWP3XElyAMCWaJ2k4hozJnlpCP/LOS4ActAZHVMjRgCxea9SRMgvSaAMtS9ZcyIXOZl0jj02vKGqEpRUh77NWXygy5uvgZD1Xi2m649TgcMfj+4mTsHf6/AZew6KZAiOV0K6lDvvK1wcDG4RaV8oLfL2tNHzhWc2AYQw== masaya tarui environment="SVN_ACCOUNT_NAME=tenderlove" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPZIZcyNtRMe1hLxNA9huQVIZVy1iKIN54lh7+f80WBm aaron@TC.local tenderlove -environment="SVN_ACCOUNT_NAME=tmm1" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDRMxTKV1W0f6BrUWacQkCL/7f2E+QzN/jgcDeHJrznnNeKs9zYLjKUllpwVL8AqTaOCq4rV5g84TlZbnAVfY+8eGWVI5sMXk2TzbNu521+xrD1xFegzKAfOSXQsQx7tyR5aRmTJSfx5nWfsnng/jxFnCiGTuy+a7TxdnfZhdYqL66ltFLpD2grEgOtmcCIx9SF9WX2DZPz7vEabBbgp5+ZFNsl2ST/NcuqABNzdqnw/51CGavetsr/t2nR7mdgqKDWX9Xfh9bM0Pzzs9xSA82GnEW4X9KSGIMLgg2MSbFGRrCisPUSE1ynlv5e6jZ2Zgj0oILYGrxRHwGFbsaSMr9Z ruby@tmm1.net tmm1 environment="SVN_ACCOUNT_NAME=tompng" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOerhB9Jkj3TXkuoMHp/7ztQbh0K38z2TT1PUd9mHusn tomoya.ishida@MacBook-Pro.local environment="SVN_ACCOUNT_NAME=usa" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAxSL9or7AewvAqq1pI6W0SKBN5RQA4t5sam9b1IxavJMzH0K8piCDSaBwW+E5Rr7Q85V4vHRGMoNTYCh34z4aR0DW1JRDfuzvdz2193FKWpWKbQhGdfZpRnb4YYdSf3YfvtEn6Q9l94W9abjp7ymH+Rznl7r5g8z6YxuHUtgrjKtMkBU1xGmtGGslTcC6cOSCCzPGTnpRDmriTzKE4h9THKbUMoUmzLRvzGVrDbMzLXmv6VojsIsTLbN6JsscfKTsjve2kB6k238hlQQAuRabjq1xRrHJW+37fqEGGKA7IQD5MEbW/iF4l3UbgUowk3yAAyDY8d7tjVKwiYVSaL5vzQ== nakamura@unigrate.co.jp usa environment="SVN_ACCOUNT_NAME=usa" ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQBzfYV0T0BJwg9BJwXZ+FtrYWB8muU/iiZdY62C6yVC5k1iGpykNnOKA/AucuaH2pqFXtDEK8jmPyIqrlmEDD5tW6J55dvY8Ws7toFqjDMUw4KZD2WMd8YtkpuClwwis3vc0kqwX8M7XklJ2gwRtflW8YuXFBYhBa8Hxl1tRQLYXzu+HTt2F3is338B04GetylkamWJ9UlizBEusMciU/rYe6jtoF6FvEJdinQ4W4+7N/NhJyaLRVfkgRfbjfE6FEZUmjIH60ofFI1Oym84ePrx0AoUHrLJvhsCA95rCnLZu1mB3+mkTFEb2zliKwcq0ND8fEKgDILwdoqqjKBMm1c7 rsa-key-20100727 usa environment="SVN_ACCOUNT_NAME=watson1978" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQAbRtEjmYWCpEiEq4EtHuVAz4PE2fK6HmDhYo255Qp3vbA02I1Nv4VJCg1IwoPCqpCc1fTjqUSFOjBCYamLmODraeEhyLbs3lx/iBZtjhEFpIjjFno2+FC4ErsFCpkAPJlq19o8BV79NWhMYI1AhANr7pywLYzBYB51O0MrFdBZ2/iNEB7XnM3pcJhrTOTRUCpfoPJ1QmSm12+bAywOaeCUO0zfjpd1xd7DEZe5MLKFWKl0txqmNFJy8YnDfY5PPda5l8DAR1u5CMYCfTXvTOCinjE8YlD/6Nj2inKxHj/AWVpclyMXmg+EA3KQKb0xE0qLTw4A6jaWJuE/o+Wi+9 watson1978 -environment="SVN_ACCOUNT_NAME=wyhaines" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1+GRY7ZSHqU8Q8PfE8zIerGUa66eKSLZ0D8rRbvKxnW5QhpxZ+8nVePtSSwH67WNuKJoBvbUmisl9N0LhGOFJt9R+1vxAp8jpXRKIPkiLkWkMgSU3BgqE0Q8d6vqo+fAhZjiNMPKHW1CAmx4rGgG6UFZsfB77J0r2wzBnJ149D44TOFsGJqLlVKC0AOqP4UnToeNzHThso5/LpKFNcR3Q7ZP5Qj5MmQPoa7PDz6lOKlHabSv1RHurYV79o5BgZKqtxcKHT+x83jgdaDMJYSrQKZb5h1lnOWax03fTqf4vwMOJtd08+GHXGy/Ci/pzOdU6b5ZMWeQSYToNetStBauJQ== wyhaines@kirk-hainess-macbook-pro.local wyhaines environment="SVN_ACCOUNT_NAME=ydah" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDOv1OcrE/vYWwD28GTjX5j8cX4V6yxRuOyde0Cbbqsce0Dovi/BzrkWalJpRIFmP5M1BfyFilOrjL9fexjtAKyxbRBWNRnm4FTb1+cmxnGeHKBD9XwIeeaY9X/EF/s2yAC6lOP+f4S72xurbTGCrVvAFJP5+21EZSrvA8p/fbMCGZCbXBYXaRmfw8oj7C7Ruz6fS6IghDM8qibZjgtXvh1bk7Q+pLn2vizQq5L90QOOUOGyQDdWMNeFtjgOTGLm1Y8+Zq9IMeNjBXF2GP4gPk2cTXIS5d+pCJAW68Jx0QUOnxXIovO04KoK3YLhuy/PDYKGjcfwrVxZvp0+1hUeD38qM/ynsqcXxq68mCyXmRpwLG0iMR31s9LjWaYkjooWFXbnOAZzNQ0VGNYDISrBNBaXddkwnMczZAOmWTNMRJetOHP7RzpvG5wflFOUhBj+/mstf/33plOHfjEljHWE/fgGdFgJlhEOMjBSZjpUX8S7WoL49ZfOL5ntU1w5wTbwdM= ydah environment="SVN_ACCOUNT_NAME=yugui" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC1d1FfWAgzOdx4xSVwHmnAUlK2xqj1ck3rCBECW+t1p1QSQ9StKqq0U+ChUdHBnW3fm7KGLIXiwAysm55+5pvfyfvm+YrdyXwE0XPi2PreIAmHdsJj02EkKmcgJa+DcyRXzYsEmk3VBMCRWNkJTJRGRIqaTEZElCILmQ04/KCM4HgRtvgo5k5Ch/U6gC876h85EnFR91syXxBIZTeOcEIYJq89c5iZEWjWpmLqwEjcCWood6gcjX/b6jlx6jO90dydKHdNPRteh5fDWVPEl54/Qjio30iiHlN6DSarG7AQnOGzq6GHN1F1VDkDLMxGj8b1SwtitBL3HpBaLZYsN3v3hSwhmoPRWpjrZvtxurwedFZHQSHIjigZzGl48WUoWHIOUci9i/iHiHbOvcqPvgqA4vuu820G3SdfR7E0OwzKwqW4o7Z4QLZ+8Gk6KFhXjApUJCXIhhtKl1ucvrz6/e0Rar7Mi3qOKep52VSKYWi5z9f/7NAbkRAJffWBxclgchDzbal3hsaamLrPisjFdml3lQKQyfn2JgYzsYYdaD4izjKutPdgtojRLOTWE9B4dk1838v/wTsabST7qWxt4daBAOB9fRjLuJ0CIKJswAD054SiOdkyllU410iRLS6/lM4zkdD42+nKChhgYvQtcCzErbLhRUiCKWme0BxXFZ7kQw== yugui@yugui-macbookpro-3.local yugui environment="SVN_ACCOUNT_NAME=yui-knk" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3DwgGe2ZC2YBnMLXrncNYrzYkMpQ0CQJvfZj/I92dkXGQ5/7IwyYwMd/XH3fz58IGmYvnsLInnnlBXznCVubV8AH6fw3batpkiAq4AT7yf+Fql/OGn5VOQztxEzOc0LKqDn6WKPzlPvqixj+K3CboXItdURScsMJxwNhBS9WpXKZ9ZMF+BQqb8DddMMRSORNK3JWJBsUgYEJh4CZ00T7IF+xzI/LiQUDdrwzFYyRS1xuPge61LtU/nrNkzGyB4Jpxk4HfJLXsZ/E6B2F8sjDTvCl2AE5fzPzeP/fbnOVBTnGbYg3MZ35gELgIRvjMr6CQtV0derVWUh416M7H6iIv yui-knk From 17c402f7d67920b56c8c1f0baa83da2dc0f45362 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Fri, 21 Mar 2025 11:56:45 -0700 Subject: [PATCH 92/99] Update my public key I got a new computer and updated my keys --- recipes/files/var/git/.ssh/authorized_keys | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/files/var/git/.ssh/authorized_keys b/recipes/files/var/git/.ssh/authorized_keys index 9392c5d0..9fef3dbb 100644 --- a/recipes/files/var/git/.ssh/authorized_keys +++ b/recipes/files/var/git/.ssh/authorized_keys @@ -64,7 +64,7 @@ environment="SVN_ACCOUNT_NAME=soutaro" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGz environment="SVN_ACCOUNT_NAME=stomar" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDkdyOaVR4r4Rb1ELKEoZMQzxWIKoMEd/nAc0iiP44OJGWiDAQf9RxPaciiwiscP4RfYOOTJc+gZjxluPso/mqibGXd2VBW3+CWGcLEk7uBScZtTb50m//eg+dZHDzzkda7/o1ZelwprG8RSrCs2NAneIyPgMzdElV9V1963KeDzuex0uEL1MG8a+H7IC9rVl80QNl4J37DHQtaqcOQ4nY3qKOTOKBIPosf5ScAVeGmAG1ekL8I9NI8gQYPtxXwPVBgncmd6O6so4CBx0zO8Q+nmE2wwMCRrg06pPKggSPKstwId0LnFW3XoHGaAX69wQxv9b/C5FsRrMtXPnKD6o15zcTFN+Rvnwp3tQwnLEwn2/CzjF07ctxY9wzL+Phs0jAoa/BcR6WoQg4vrh2ZKpgmvkNtLT1wxQGvm4Yoq0K+coPxpmXs5jT5c+Ws9V9raG7H6IeR3DrPMCxd500F+DsbEW3In7zSQ55QuyYpO7vYWBBHyvGQq70yiwCFEjAwfCGlSbrZY4qdPR6/4V3q1Y8BQRIqAWUg/LEyIY4Gw1XXJ27vdfqBI6YIfNeegL+boWh6qaKpWJ12jcc7RakQEM+yIFjDN+VeAsuxhyGC9ZKhp2x4qUir7GlDGKyOpIZNXIiyLNzqau7Oi9qbToYHrY8Tvk/HsBx9pac5r82f5Skl0w== stomar@ruby-lang.org stomar environment="SVN_ACCOUNT_NAME=tadd" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCdJXwiupBUJihQtx2m2Nmt88t3iWFx6542lT987zRm0XMNVqUG1lxFZs/hZutyagr12juhCoHD6nRoKR2QjfqnQwD4PZIzRWXzRvenZcEkSghJrMu7QQsR/6GsDbWrTmW5TWy72IscehLR3A0fcHxgiT454r5vudN3rXdY5BmS6gUumKaqVAyNiRirev0uOWOr/IClt14LcID+CVbSWuP3Qv+p4FRmPBlGIgD7rdVcI/Vyf5KCUDPQ+5nHyMGcp0rPQ9tbCvng8MSFGwokYU8AwWxux0haH1XMKKZ5Nk2Xh2lEvgPtubOEd/oNCB/mhCFXZw6vr38d11qzMMM1RdbbajHERB2t87UIjvBtJ2SfIsJSFv+BCG09xfXjqiGmtCA7obTIEomM0AEOSaY76UB4WPNHVm9i7TNKZQAouokuOvB4c30hpd1D/VOYkTH1fP3Pv9UlBNNj4EomFz+gvnh0uwLJ3GdZLrcQjdrSsFfgs5/wlB81rjqz1aDLHYNGpTYZw+CqTeG6JMgf+JyiSg49t7JCp9wVXytaFoAIDD8/fUl0VCiOPo701yTeZbIyInjl7s024GFitGrTYRWTRb3AaeZ+G+9IlYQPKKWeIa16paVJHSXi9BoT5rhhIGKx7f9ysR9dHEQR4clGJQJVVXqDisW4GZxiZwqJNJgFw20Q6Q== tadd environment="SVN_ACCOUNT_NAME=takano32" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDI+cB9tLV++KbpGN7K5dv+3lgWqSinnvvjAYn3QW4Pf takano32@gmail.com -environment="SVN_ACCOUNT_NAME=tenderlove" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPZIZcyNtRMe1hLxNA9huQVIZVy1iKIN54lh7+f80WBm aaron@TC.local tenderlove +environment="SVN_ACCOUNT_NAME=tenderlove" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG201JUS0HKQm69UXHLWhXADt67ceXYEgYPxU5NoWgpM tenderlove@ruby-lang.org environment="SVN_ACCOUNT_NAME=tompng" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOerhB9Jkj3TXkuoMHp/7ztQbh0K38z2TT1PUd9mHusn tomoya.ishida@MacBook-Pro.local environment="SVN_ACCOUNT_NAME=usa" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAxSL9or7AewvAqq1pI6W0SKBN5RQA4t5sam9b1IxavJMzH0K8piCDSaBwW+E5Rr7Q85V4vHRGMoNTYCh34z4aR0DW1JRDfuzvdz2193FKWpWKbQhGdfZpRnb4YYdSf3YfvtEn6Q9l94W9abjp7ymH+Rznl7r5g8z6YxuHUtgrjKtMkBU1xGmtGGslTcC6cOSCCzPGTnpRDmriTzKE4h9THKbUMoUmzLRvzGVrDbMzLXmv6VojsIsTLbN6JsscfKTsjve2kB6k238hlQQAuRabjq1xRrHJW+37fqEGGKA7IQD5MEbW/iF4l3UbgUowk3yAAyDY8d7tjVKwiYVSaL5vzQ== nakamura@unigrate.co.jp usa environment="SVN_ACCOUNT_NAME=usa" ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQBzfYV0T0BJwg9BJwXZ+FtrYWB8muU/iiZdY62C6yVC5k1iGpykNnOKA/AucuaH2pqFXtDEK8jmPyIqrlmEDD5tW6J55dvY8Ws7toFqjDMUw4KZD2WMd8YtkpuClwwis3vc0kqwX8M7XklJ2gwRtflW8YuXFBYhBa8Hxl1tRQLYXzu+HTt2F3is338B04GetylkamWJ9UlizBEusMciU/rYe6jtoF6FvEJdinQ4W4+7N/NhJyaLRVfkgRfbjfE6FEZUmjIH60ofFI1Oym84ePrx0AoUHrLJvhsCA95rCnLZu1mB3+mkTFEb2zliKwcq0ND8fEKgDILwdoqqjKBMm1c7 rsa-key-20100727 usa From 9b0fed687a8d156372235fb0dda4eb5a1d32c6ae Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 26 Mar 2025 10:08:49 +0900 Subject: [PATCH 93/99] Added robots.txt --- recipes/apache2.rb | 5 +++++ .../files/etc/apache2/sites-available/git.ruby-lang.org.conf | 1 + recipes/files/var/www/git.ruby-lang.org/robots.txt | 2 ++ 3 files changed, 8 insertions(+) create mode 100644 recipes/files/var/www/git.ruby-lang.org/robots.txt diff --git a/recipes/apache2.rb b/recipes/apache2.rb index 59f92848..36fcdc3b 100644 --- a/recipes/apache2.rb +++ b/recipes/apache2.rb @@ -18,6 +18,11 @@ action :nothing end +remote_file '/var/www/git.ruby-lang.org/robots.txt' do + mode '644' + owner 'root' +end + %w[git svn].each do |subdomain| remote_file "/etc/apache2/sites-available/#{subdomain}.ruby-lang.org.conf" do mode '644' diff --git a/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf b/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf index d38a8564..0c0ae17c 100644 --- a/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf +++ b/recipes/files/etc/apache2/sites-available/git.ruby-lang.org.conf @@ -19,6 +19,7 @@ TimeOut 300 Alias /cgit-css "/usr/share/cgit/" + Alias /robots.txt "/var/www/git.ruby-lang.org/robots.txt" ScriptAlias /webhook "/home/git/git.ruby-lang.org/cgi-bin/webhook.cgi/" diff --git a/recipes/files/var/www/git.ruby-lang.org/robots.txt b/recipes/files/var/www/git.ruby-lang.org/robots.txt new file mode 100644 index 00000000..1f53798b --- /dev/null +++ b/recipes/files/var/www/git.ruby-lang.org/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: / From df9da8df23c047e8fb8f92dc9a7daf198f3088e2 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 26 Mar 2025 11:38:46 +0900 Subject: [PATCH 94/99] Added cgit.conf --- recipes/apache2.rb | 6 + .../etc/apache2/conf-available/cgit.conf | 318 ++++++++++++++++++ 2 files changed, 324 insertions(+) create mode 100644 recipes/files/etc/apache2/conf-available/cgit.conf diff --git a/recipes/apache2.rb b/recipes/apache2.rb index 36fcdc3b..99a2fc40 100644 --- a/recipes/apache2.rb +++ b/recipes/apache2.rb @@ -23,6 +23,12 @@ owner 'root' end +remote_file '/etc/apache2/conf-available/cgit.conf' do + mode '644' + owner 'root' + notifies :reload, 'service[apache2]' +end + %w[git svn].each do |subdomain| remote_file "/etc/apache2/sites-available/#{subdomain}.ruby-lang.org.conf" do mode '644' diff --git a/recipes/files/etc/apache2/conf-available/cgit.conf b/recipes/files/etc/apache2/conf-available/cgit.conf new file mode 100644 index 00000000..40cdf8ec --- /dev/null +++ b/recipes/files/etc/apache2/conf-available/cgit.conf @@ -0,0 +1,318 @@ +ScriptAlias /cgit/ "/usr/lib/cgit/cgit.cgi/" +RedirectMatch ^/cgit$ /cgit/ +Alias /cgit-css "/usr/share/cgit/" + + AllowOverride None + Options ExecCGI FollowSymlinks + Require all granted + + Order Allow,Deny + Allow from all + +Deny from 100.27.8.240 +Deny from 101.32.115.96 +Deny from 101.32.240.178 +Deny from 101.32.242.16 +Deny from 101.32.243.24 +Deny from 101.32.244.173 +Deny from 101.32.254.77 +Deny from 103.121.39.54 +Deny from 119.28.105.111 +Deny from 124.156.196.210 +Deny from 124.156.200.172 +Deny from 124.156.205.228 +Deny from 124.156.207.130 +Deny from 129.226.146.19 +Deny from 129.226.150.55 +Deny from 129.226.151.215 +Deny from 129.226.154.196 +Deny from 129.226.156.129 +Deny from 129.226.158.117 +Deny from 129.226.192.111 +Deny from 129.226.192.224 +Deny from 129.226.193.30 +Deny from 129.226.209.118 +Deny from 129.226.91.207 +Deny from 129.226.92.236 +Deny from 129.226.92.4 +Deny from 150.109.11.222 +Deny from 150.109.12.106 +Deny from 150.109.13.249 +Deny from 150.109.17.45 +Deny from 150.109.20.64 +Deny from 150.109.21.76 +Deny from 150.109.23.33 +Deny from 150.109.24.245 +Deny from 150.109.25.235 +Deny from 170.106.107.202 +Deny from 170.106.108.10 +Deny from 170.106.109.24 +Deny from 170.106.115.155 +Deny from 170.106.142.139 +Deny from 170.106.148.16 +Deny from 170.106.151.66 +Deny from 170.106.169.165 +Deny from 170.106.172.189 +Deny from 170.106.177.16 +Deny from 170.106.187.237 +Deny from 170.106.187.99 +Deny from 170.106.192.82 +Deny from 170.106.197.128 +Deny from 170.106.84.19 +Deny from 18.234.184.27 +Deny from 194.120.230.118 +Deny from 195.191.219.130 +Deny from 195.62.32.102 +Deny from 20.171.207.103 +Deny from 20.171.207.108 +Deny from 20.171.207.192 +Deny from 20.171.207.209 +Deny from 20.171.207.230 +Deny from 20.171.207.65 +Deny from 20.171.207.86 +Deny from 202.127.183.178 +Deny from 207.180.245.57 +Deny from 216.244.66.230 +Deny from 24.131.231.46 +Deny from 3.237.46.45 +Deny from 34.229.134.0 +Deny from 43.128.84.42 +Deny from 43.128.88.143 +Deny from 43.128.89.170 +Deny from 43.130.0.17 +Deny from 43.130.12.196 +Deny from 43.130.13.203 +Deny from 43.130.17.168 +Deny from 43.130.2.53 +Deny from 43.130.31.206 +Deny from 43.130.35.10 +Deny from 43.130.35.85 +Deny from 43.130.40.43 +Deny from 43.130.48.193 +Deny from 43.130.58.215 +Deny from 43.130.60.10 +Deny from 43.130.61.214 +Deny from 43.133.38.100 +Deny from 43.133.43.121 +Deny from 43.133.43.154 +Deny from 43.133.43.227 +Deny from 43.133.56.146 +Deny from 43.133.57.8 +Deny from 43.133.59.248 +Deny from 43.133.60.115 +Deny from 43.133.60.97 +Deny from 43.133.62.111 +Deny from 43.133.62.221 +Deny from 43.134.0.62 +Deny from 43.134.107.106 +Deny from 43.134.109.11 +Deny from 43.134.112.111 +Deny from 43.134.118.145 +Deny from 43.134.119.86 +Deny from 43.134.12.237 +Deny from 43.134.121.104 +Deny from 43.134.15.134 +Deny from 43.134.16.138 +Deny from 43.134.163.161 +Deny from 43.134.165.87 +Deny from 43.134.167.226 +Deny from 43.134.176.114 +Deny from 43.134.184.91 +Deny from 43.134.229.118 +Deny from 43.134.231.229 +Deny from 43.134.236.64 +Deny from 43.134.26.191 +Deny from 43.134.26.28 +Deny from 43.134.41.2 +Deny from 43.134.46.116 +Deny from 43.134.48.88 +Deny from 43.134.56.250 +Deny from 43.134.57.196 +Deny from 43.134.61.126 +Deny from 43.134.61.238 +Deny from 43.134.63.65 +Deny from 43.134.64.76 +Deny from 43.134.69.123 +Deny from 43.134.69.90 +Deny from 43.134.72.28 +Deny from 43.134.73.181 +Deny from 43.134.75.217 +Deny from 43.134.77.29 +Deny from 43.134.91.203 +Deny from 43.134.91.49 +Deny from 43.134.99.61 +Deny from 43.135.129.240 +Deny from 43.135.129.244 +Deny from 43.135.131.147 +Deny from 43.135.134.141 +Deny from 43.135.135.246 +Deny from 43.135.138.166 +Deny from 43.135.141.103 +Deny from 43.135.144.133 +Deny from 43.135.145.56 +Deny from 43.135.147.140 +Deny from 43.135.150.154 +Deny from 43.135.156.161 +Deny from 43.135.158.194 +Deny from 43.135.173.248 +Deny from 43.135.177.50 +Deny from 43.135.179.97 +Deny from 43.135.186.136 +Deny from 43.153.1.102 +Deny from 43.153.10.102 +Deny from 43.153.10.154 +Deny from 43.153.103.133 +Deny from 43.153.105.93 +Deny from 43.153.106.120 +Deny from 43.153.107.175 +Deny from 43.153.11.31 +Deny from 43.153.12.7 +Deny from 43.153.122.155 +Deny from 43.153.13.111 +Deny from 43.153.14.12 +Deny from 43.153.14.242 +Deny from 43.153.17.158 +Deny from 43.153.18.46 +Deny from 43.153.193.211 +Deny from 43.153.20.154 +Deny from 43.153.20.37 +Deny from 43.153.23.112 +Deny from 43.153.23.244 +Deny from 43.153.23.81 +Deny from 43.153.29.199 +Deny from 43.153.3.32 +Deny from 43.153.30.97 +Deny from 43.153.34.43 +Deny from 43.153.37.58 +Deny from 43.153.39.234 +Deny from 43.153.4.65 +Deny from 43.153.46.109 +Deny from 43.153.5.20 +Deny from 43.153.52.32 +Deny from 43.153.58.32 +Deny from 43.153.6.132 +Deny from 43.153.60.85 +Deny from 43.153.61.213 +Deny from 43.153.62.136 +Deny from 43.153.69.7 +Deny from 43.153.76.232 +Deny from 43.153.80.61 +Deny from 43.153.84.42 +Deny from 43.153.97.220 +Deny from 43.156.107.145 +Deny from 43.156.12.8 +Deny from 43.156.2.243 +Deny from 43.156.29.120 +Deny from 43.156.29.145 +Deny from 43.156.3.195 +Deny from 43.156.5.207 +Deny from 43.156.6.103 +Deny from 43.159.131.116 +Deny from 43.159.133.74 +Deny from 43.159.137.20 +Deny from 43.159.139.35 +Deny from 43.159.144.118 +Deny from 43.159.144.69 +Deny from 43.159.144.95 +Deny from 43.159.146.48 +Deny from 43.159.32.86 +Deny from 43.159.37.213 +Deny from 43.159.41.139 +Deny from 43.159.41.195 +Deny from 43.163.0.23 +Deny from 43.163.8.75 +Deny from 44.212.14.20 +Deny from 47.238.13.10 +Deny from 47.238.13.11 +Deny from 47.238.13.12 +Deny from 47.238.13.13 +Deny from 47.238.13.14 +Deny from 47.238.13.15 +Deny from 47.238.13.16 +Deny from 47.238.13.17 +Deny from 47.238.13.18 +Deny from 47.238.13.9 +Deny from 47.242.148.169 +Deny from 47.242.149.96 +Deny from 47.242.160.82 +Deny from 47.242.167.47 +Deny from 47.242.209.147 +Deny from 47.242.217.111 +Deny from 47.242.222.214 +Deny from 47.242.234.100 +Deny from 47.242.235.57 +Deny from 47.242.3.114 +Deny from 47.242.76.207 +Deny from 47.242.77.69 +Deny from 47.242.95.94 +Deny from 47.243.105.139 +Deny from 47.243.173.250 +Deny from 47.243.193.222 +Deny from 47.243.228.99 +Deny from 47.243.234.164 +Deny from 47.243.48.79 +Deny from 47.243.56.171 +Deny from 47.243.62.121 +Deny from 47.243.71.191 +Deny from 47.243.74.123 +Deny from 47.243.75.156 +Deny from 47.243.78.23 +Deny from 47.243.78.44 +Deny from 47.243.79.195 +Deny from 47.243.89.37 +Deny from 47.243.91.206 +Deny from 47.76.209.138 +Deny from 47.76.220.119 +Deny from 47.76.222.244 +Deny from 47.76.99.127 +Deny from 49.51.180.62 +Deny from 49.51.206.134 +Deny from 49.51.70.229 +Deny from 49.51.70.245 +Deny from 51.222.253.1 +Deny from 51.222.253.10 +Deny from 51.222.253.11 +Deny from 51.222.253.12 +Deny from 51.222.253.13 +Deny from 51.222.253.14 +Deny from 51.222.253.15 +Deny from 51.222.253.16 +Deny from 51.222.253.17 +Deny from 51.222.253.18 +Deny from 51.222.253.19 +Deny from 51.222.253.2 +Deny from 51.222.253.20 +Deny from 51.222.253.3 +Deny from 51.222.253.4 +Deny from 51.222.253.5 +Deny from 51.222.253.6 +Deny from 51.222.253.7 +Deny from 51.222.253.8 +Deny from 51.222.253.9 +Deny from 54.157.118.241 +Deny from 66.249.66.34 +Deny from 66.249.68.39 +Deny from 66.249.79.133 +Deny from 66.249.79.202 +Deny from 66.249.79.203 +Deny from 8.210.12.248 +Deny from 8.210.147.121 +Deny from 8.210.15.246 +Deny from 8.210.153.23 +Deny from 8.210.154.94 +Deny from 8.210.164.94 +Deny from 8.210.176.195 +Deny from 8.210.179.35 +Deny from 8.210.187.5 +Deny from 8.210.188.13 +Deny from 8.210.189.26 +Deny from 8.210.190.0 +Deny from 8.210.190.63 +Deny from 8.210.66.89 +Deny from 8.210.75.120 +Deny from 8.210.8.206 +Deny from 8.210.86.148 +Deny from 8.210.86.249 +Deny from 8.218.91.49 + + From 4483cc68f600c5fbe8e69369f6cadec23cbfb469 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 2 Apr 2025 18:33:31 +0900 Subject: [PATCH 95/99] Removed false positive IP --- recipes/files/etc/apache2/conf-available/cgit.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/files/etc/apache2/conf-available/cgit.conf b/recipes/files/etc/apache2/conf-available/cgit.conf index 40cdf8ec..30996236 100644 --- a/recipes/files/etc/apache2/conf-available/cgit.conf +++ b/recipes/files/etc/apache2/conf-available/cgit.conf @@ -70,7 +70,6 @@ Deny from 20.171.207.209 Deny from 20.171.207.230 Deny from 20.171.207.65 Deny from 20.171.207.86 -Deny from 202.127.183.178 Deny from 207.180.245.57 Deny from 216.244.66.230 Deny from 24.131.231.46 From ba07f5b98cd550a3c22404a7d16339f79b22cd03 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Fri, 18 Apr 2025 06:35:41 +0900 Subject: [PATCH 96/99] We no longer have ruby.pre.git --- hooks/post-receive-pre.sh | 45 --------------------------------------- hooks/pre-receive-pre.sh | 24 --------------------- 2 files changed, 69 deletions(-) delete mode 100755 hooks/post-receive-pre.sh delete mode 100755 hooks/pre-receive-pre.sh diff --git a/hooks/post-receive-pre.sh b/hooks/post-receive-pre.sh deleted file mode 100755 index 5e34e0b0..00000000 --- a/hooks/post-receive-pre.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -u -set -o pipefail -# This script is executed by `git@git.ruby-lang.org:ruby.pre.git/hooks/post-receive`. -# The ruby.pre repository is just a sandbox, and any commit isn't pushed to it automatically. -# Its outputs are logged to `/tmp/post-receive-pre.log`. - -# script parameters -ruby_git="/var/git/ruby.pre.git" -ruby_commit_hook="$(cd "$(dirname $0)"; cd ..; pwd)" - -function log() { - echo -e "[$$: $(date "+%Y-%m-%d %H:%M:%S %Z")] $1" -} - -log "### start ###" -log "args: $*" - -# log "==> github sync" -# git remote update; git push github - -# log "==> notify slack" -# "${ruby_commit_hook}/bin/notify-slack-commits.rb" $* - -# log "==> commit-email.rb" -# "${ruby_commit_hook}/bin/commit-email.rb" \ -# "$ruby_git" ruby-cvs@ruby-lang.org $* \ -# --viewer-uri "https://github.com/ruby/ruby/commit/" \ -# --error-to cvs-admin@ruby-lang.org - -log "==> redmine fetch changesets" -curl -s "https://bugs.ruby-lang.org/sys/fetch_changesets?key=`cat ~git/config/redmine.key`" & - -# Make extra commits from here. -# The above procedure will be executed for the these commits in another post-receive hook. - -log "==> auto-style" -SVN_ACCOUNT_NAME=git "${ruby_commit_hook}/bin/auto-style.rb" "$ruby_git" $* - -log "==> update-version.h" -SVN_ACCOUNT_NAME=git "${ruby_commit_hook}/bin/update-version.h.rb" git "$ruby_git" $* - -log "==> notes-github-pr" -SVN_ACCOUNT_NAME=git "${ruby_commit_hook}/bin/notes-github-pr.rb" "$ruby_git" $* - -log "### end ###\n" diff --git a/hooks/pre-receive-pre.sh b/hooks/pre-receive-pre.sh deleted file mode 100755 index 559f6b15..00000000 --- a/hooks/pre-receive-pre.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -eu -set -o pipefail -# This script is executed by `git@git.ruby-lang.org:ruby.pre.git/hooks/pre-receive`. -# The ruby.pre repository is just a sandbox, and any commit isn't pushed to it automatically. -# Its outputs are logged to `/tmp/pre-receive-pre.log`. - -# script parameters -ruby_git="/var/git/ruby.git" -ruby_commit_hook="$(cd "$(dirname $0)"; cd ..; pwd)" - -function log() { - echo -e "[$$: $(date "+%Y-%m-%d %H:%M:%S %Z")] $1" -} - -log "### start ###" -log "args: $*" - -log "==> prohibit merge commits" -"${ruby_commit_hook}/bin/prohibit-merge-commits.rb" $* || exit 1 - -log "==> check email and refname" -"${ruby_commit_hook}/bin/check-email-and-refname.rb" $* || exit 1 - -log "### end ###\n" From a8635a4cd93c8adc2e1b48b6ae8fa3fcd3bb4b34 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Fri, 18 Apr 2025 06:45:56 +0900 Subject: [PATCH 97/99] Do not trim trailing spaces from TRICK code --- bin/auto-style.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/auto-style.rb b/bin/auto-style.rb index 838c2b3d..8dc7e1bd 100755 --- a/bin/auto-style.rb +++ b/bin/auto-style.rb @@ -155,6 +155,9 @@ def with_clean_env # to respect the original statements of licenses %r{\ALEGAL\z}, + + # trailing spaces could be intentional in TRICK code + %r{\Asample/trick[^/]*/}, ] repo_path, *rest = ARGV From ea08b02e5662eb1d8d9c1aa44e908b7da959efe5 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Fri, 18 Apr 2025 08:54:05 +0900 Subject: [PATCH 98/99] Remove auto-style It has been migrated to ruby/ruby. --- bin/auto-style.rb | 239 ------------------------------------------ hooks/post-receive.sh | 3 - 2 files changed, 242 deletions(-) delete mode 100755 bin/auto-style.rb diff --git a/bin/auto-style.rb b/bin/auto-style.rb deleted file mode 100755 index 8dc7e1bd..00000000 --- a/bin/auto-style.rb +++ /dev/null @@ -1,239 +0,0 @@ -#!/usr/bin/env ruby -# Usage: -# auto-style.rb [repo_path] [args...] - -require 'shellwords' -require 'tmpdir' -ENV['LC_ALL'] = 'C' - -class Git - attr_reader :depth - - def initialize(oldrev, newrev, branch) - @oldrev = oldrev - @newrev = newrev - @branch = branch - with_clean_env do - @revs = {} - IO.popen(['git', 'log', '--format=%H %s', "#{@oldrev}..#{@newrev}"]) do |f| - f.each do |line| - line.chomp! - rev, subj = line.split(' ', 2) - @revs[rev] = subj - end - end - @depth = @revs.size - end - end - - # ["foo/bar.c", "baz.h", ...] - def updated_paths - with_clean_env do - IO.popen(['git', 'diff', '--name-only', @oldrev, @newrev], &:readlines).each(&:chomp!) - end - end - - # [0, 1, 4, ...] - def updated_lines(file) - lines = [] - revs = @revs.map {|rev, subj| rev unless subj.start_with?("Revert ")}.compact - revs_pattern = /\A(?:#{revs.join('|')}) / - with_clean_env { IO.popen(['git', 'blame', '-l', '--', file], &:readlines) }.each_with_index do |line, index| - if revs_pattern =~ line - lines << index - end - end - lines - end - - def commit(log, *files) - git('add', *files) - git('commit', '-m', log) - git('push', 'origin', @branch) - end - - private - - def git(*args) - cmd = ['git', *args].shelljoin - unless with_clean_env { system(cmd) } - abort "Failed to run: #{cmd}" - end - end - - def with_clean_env - git_dir = ENV.delete('GIT_DIR') # this overcomes '-C' or pwd - yield - ensure - ENV['GIT_DIR'] = git_dir if git_dir - end -end - -DEFAULT_GEM_LIBS = %w[ - bundler - cmath - csv - e2mmap - fileutils - forwardable - ipaddr - irb - logger - matrix - mutex_m - ostruct - prime - rdoc - rexml - rss - scanf - shell - sync - thwait - tracer - webrick -] - -DEFAULT_GEM_EXTS = %w[ - bigdecimal - date - dbm - digest - etc - fcntl - fiddle - gdbm - io/console - io/nonblock - json - openssl - psych - racc - sdbm - stringio - strscan - zlib -] - -IGNORED_FILES = [ - # default gems whose master is GitHub - %r{\Abin/(?!erb)\w+\z}, - *(DEFAULT_GEM_LIBS + DEFAULT_GEM_EXTS).flat_map { |lib| - [ - %r{\Alib/#{lib}/}, - %r{\Alib/#{lib}\.gemspec\z}, - %r{\Alib/#{lib}\.rb\z}, - %r{\Atest/#{lib}/}, - ] - }, - *DEFAULT_GEM_EXTS.flat_map { |ext| - [ - %r{\Aext/#{ext}/}, - %r{\Atest/#{ext}/}, - ] - }, - - # vendoring (ccan) - %r{\Accan/}, - - # vendoring (io/) - %r{\Aext/io/}, - - # vendoring (nkf) - %r{\Aext/nkf/nkf-utf8/}, - - # vendoring (onigmo) - %r{\Aenc/}, - %r{\Ainclude/ruby/onigmo\.h\z}, - %r{\Areg.+\.(c|h)\z}, - - # explicit or implicit `c-file-style: "linux"` - %r{\Aaddr2line\.c\z}, - %r{\Amissing/}, - %r{\Astrftime\.c\z}, - %r{\Avsnprintf\.c\z}, - - # to respect the original statements of licenses - %r{\ALEGAL\z}, - - # trailing spaces could be intentional in TRICK code - %r{\Asample/trick[^/]*/}, -] - -repo_path, *rest = ARGV -rest.each_slice(3).map do |oldrev, newrev, refname| - branch = IO.popen({ 'GIT_DIR' => repo_path }, ['git', 'rev-parse', '--symbolic', '--abbrev-ref', refname], &:read).strip - next if branch != 'master' # Stable branches are on svn, and for consistency we should not make a git-specific commit. - vcs = Git.new(oldrev, newrev, branch) - - Dir.mktmpdir do |workdir| - depth = vcs.depth + 1 - system "git clone --depth=#{depth} --branch=#{branch} file:///#{repo_path} #{workdir}" - Dir.chdir(workdir) - - paths = vcs.updated_paths - paths.select! {|l| - /^\d/ !~ l and /\.bat\z/ !~ l and - (/\A(?:config|[Mm]akefile|GNUmakefile|README)/ =~ File.basename(l) or - /\A\z|\.(?:[chsy]|\d+|e?rb|tmpl|bas[eh]|z?sh|in|ma?k|def|src|trans|rdoc|ja|en|el|sed|awk|p[ly]|scm|mspec|html|)\z/ =~ File.extname(l)) - } - files = paths.select {|n| File.file?(n) } - files.reject! do |f| - IGNORED_FILES.any? { |re| f.match(re) } - end - next if files.empty? - - trailing = eofnewline = expandtab = false - - edited_files = files.select do |f| - src = File.binread(f) rescue next - eofnewline = eofnewline0 = true if src.sub!(/(? auto-style" -SVN_ACCOUNT_NAME=git "${ruby_commit_hook}/bin/auto-style.rb" "$ruby_git" $* - log "==> update-version.h" SVN_ACCOUNT_NAME=git "${ruby_commit_hook}/bin/update-version.h.rb" git "$ruby_git" $* From 1cc06e77d2cab5584ab93c6a1bc62bde611dda92 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 24 Apr 2025 13:45:59 +0900 Subject: [PATCH 99/99] Drop 93.123.109.83 --- recipes/files/etc/apache2/conf-available/cgit.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/files/etc/apache2/conf-available/cgit.conf b/recipes/files/etc/apache2/conf-available/cgit.conf index 30996236..524db776 100644 --- a/recipes/files/etc/apache2/conf-available/cgit.conf +++ b/recipes/files/etc/apache2/conf-available/cgit.conf @@ -313,5 +313,6 @@ Deny from 8.210.8.206 Deny from 8.210.86.148 Deny from 8.210.86.249 Deny from 8.218.91.49 +Deny from 93.123.109.83