From 8c1cb7c99809541c4782055a1591155f5e7749a2 Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Mon, 17 Aug 2015 17:01:39 +0200 Subject: Replace cvs to rsync with git to rsync Due to git migration. --- general-concepts/cvs-to-rsync/diagram.svg | 142 ------------------------------ general-concepts/cvs-to-rsync/text.xml | 40 --------- general-concepts/git-to-rsync/diagram.svg | 142 ++++++++++++++++++++++++++++++ general-concepts/git-to-rsync/text.xml | 40 +++++++++ general-concepts/mirrors/text.xml | 2 +- general-concepts/text.xml | 2 +- 6 files changed, 184 insertions(+), 184 deletions(-) delete mode 100644 general-concepts/cvs-to-rsync/diagram.svg delete mode 100644 general-concepts/cvs-to-rsync/text.xml create mode 100644 general-concepts/git-to-rsync/diagram.svg create mode 100644 general-concepts/git-to-rsync/text.xml diff --git a/general-concepts/cvs-to-rsync/diagram.svg b/general-concepts/cvs-to-rsync/diagram.svg deleted file mode 100644 index ed31af7..0000000 --- a/general-concepts/cvs-to-rsync/diagram.svg +++ /dev/null @@ -1,142 +0,0 @@ - - - - CVS to RSYNC Propagation - - - - - Developers - - - - - - - - Developers - - - - - Developers - - - - - CVS - - - - - - - - - Staging - Box - - - - - - - - - rsync1 - - - - - - - - - Public rsync - - - - - - - - - Public rsync - - - - - - - - - Public rsync - - - - - - - - - Users - - - - - - - - - Users - - - - - - - - - Users - - - - - - - - Users - - - - - - - - - Users - - - - diff --git a/general-concepts/cvs-to-rsync/text.xml b/general-concepts/cvs-to-rsync/text.xml deleted file mode 100644 index 9a379e6..0000000 --- a/general-concepts/cvs-to-rsync/text.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - -CVS to RSYNC - - - -

- Changes made to the tree are propagated to the users in stages: -

- -
    -
  • - Developer commits to CVS. -
  • -
  • - Staging box syncs from CVS and generates the metadata cache. -
  • -
  • - rsync1 syncs from the staging box. -
  • -
  • - Public rsync servers sync from rsync1. -
  • -
  • - Users sync from the public rsync servers. -
  • -
- -
- Diagram showing CVS to RSYNC Propagation -
- -

- The emerge-websync snapshot is made daily from the staging box. -

- - -
-
diff --git a/general-concepts/git-to-rsync/diagram.svg b/general-concepts/git-to-rsync/diagram.svg new file mode 100644 index 0000000..8cf7414 --- /dev/null +++ b/general-concepts/git-to-rsync/diagram.svg @@ -0,0 +1,142 @@ + + + + CVS to RSYNC Propagation + + + + + Developers + + + + + + + + Developers + + + + + Developers + + + + + Git Remote + + + + + + + + + Staging + Box + + + + + + + + + rsync1 + + + + + + + + + Public rsync + + + + + + + + + Public rsync + + + + + + + + + Public rsync + + + + + + + + + Users + + + + + + + + + Users + + + + + + + + + Users + + + + + + + + Users + + + + + + + + + Users + + + + diff --git a/general-concepts/git-to-rsync/text.xml b/general-concepts/git-to-rsync/text.xml new file mode 100644 index 0000000..7cef764 --- /dev/null +++ b/general-concepts/git-to-rsync/text.xml @@ -0,0 +1,40 @@ + + + +Git to RSYNC + + + +

+ Changes made to the tree are propagated to the users in stages: +

+ +
    +
  • + Developer commits to local Git clone and pushes to central remote Git epository. Commits and pushes are signed using Git mechanisms based on GPG. +
  • +
  • + Staging box syncs from central Git repository, generates the metadata cache, ChangeLogs and signed Manifests from Git history. +
  • +
  • + rsync1 syncs from the staging box. +
  • +
  • + Public rsync servers sync from rsync1. +
  • +
  • + Users sync from the public rsync servers. +
  • +
+ +
+ Diagram showing Git to RSYNC Propagation +
+ +

+ The emerge-websync snapshot is made daily from the staging box. +

+ + +
+
diff --git a/general-concepts/mirrors/text.xml b/general-concepts/mirrors/text.xml index 7a804d9..8d81d44 100644 --- a/general-concepts/mirrors/text.xml +++ b/general-concepts/mirrors/text.xml @@ -106,7 +106,7 @@ To manually upload a file to mirror://gentoo, scp it to dev.gentoo.org:/space/distfiles-local. You must ensure that the permissions are set to ug+rw manually. The file should appear on the mirrors within four hours (note that this is less frequent than -). +). If the upstream download location for a package uses a non-standard TCP port (anything other than 21, 80 or 443), you must manually mirror the files. Not diff --git a/general-concepts/text.xml b/general-concepts/text.xml index 108fe00..c8c2b90 100644 --- a/general-concepts/text.xml +++ b/general-concepts/text.xml @@ -21,7 +21,7 @@ writing ebuilds or working with the Portage tree. - + -- cgit v1.2.3-65-gdbad