From c0c6618e830b202d6fc50796abe65a5d6a5ab2d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@debian.org>
Date: Fri, 5 Apr 2019 16:27:45 -0400
Subject: [PATCH] merge internal debian archive docs with normal ones
---
tsa/doc/debian-archive.mdwn | 14 --------------
tsa/howto/build_and_upload_debs.mdwn | 22 ++++++++++++++++++++++
2 files changed, 22 insertions(+), 14 deletions(-)
delete mode 100644 tsa/doc/debian-archive.mdwn
diff --git a/tsa/doc/debian-archive.mdwn b/tsa/doc/debian-archive.mdwn
deleted file mode 100644
index f2039eff..00000000
--- a/tsa/doc/debian-archive.mdwn
+++ /dev/null
@@ -1,14 +0,0 @@
-Internal Debian archive operations
-----------------------------------
-
-Packages should be uploaded to:
-
- alberti.torproject.org:/srv/db.torproject.org/ftp-archive/archive/pool/tpo-all/
-
-Then to install the packages:
-
- ssh alberti.tpo make -C /srv/db.torproject.org/ftp-archive
-
-This might require fixing some permissions. Do a `chmod g+w` on the
-broken directories if this happens and open a ticket if it does, to
-create a service account instead of that hack.
diff --git a/tsa/howto/build_and_upload_debs.mdwn b/tsa/howto/build_and_upload_debs.mdwn
index 563c35c5..477a2dc7 100644
--- a/tsa/howto/build_and_upload_debs.mdwn
+++ b/tsa/howto/build_and_upload_debs.mdwn
@@ -126,3 +126,25 @@ Run `dinstall`:
Archive remaning build products:
dcmd mv *.changes archives/
+
+Uploading admin packages
+========================
+
+There is a separate Debian archive, on `db.torproject.org`, which can
+be used to upload packages specifically designed to run on
+`torproject.org` infrastructure. The following `.dput.cf` should allow
+you to upload built packages to the server, provided you have the
+required accesses:
+
+ [tpo-admin]
+ fqdn = alberti.torproject.org
+ incoming = /srv/db.torproject.org/ftp-archive/archive/pool/tpo-all/
+ method = sftp
+
+Then to install the packages:
+
+ ssh alberti.torproject.org make -C /srv/db.torproject.org/ftp-archive
+
+This might require fixing some permissions. Do a `chmod g+w` on the
+broken directories if this happens and open a ticket if it does, to
+create a service account instead of that hack.
--
GitLab