From aae22721c9a168b41b5f06eea02dd8ec6977bc4a Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 12 Jun 2024 09:18:21 +0200 Subject: [PATCH] dist-git: move the code into sub-directory --- .packit.yaml | 28 ++-- .tito/packages/dist-git | 2 +- README.md | 123 +----------------- COPYING => dist-git/COPYING | 0 LICENSE => dist-git/LICENSE | 0 dist-git/README.md | 122 +++++++++++++++++ Vagrantfile => dist-git/Vagrantfile | 0 .../beaker-tests}/Makefile | 0 .../beaker-tests}/PURPOSE | 0 .../beaker-tests}/README.md | 0 .../data/prunerepo-1.1-1.fc23.src.rpm | Bin .../beaker-tests}/files/etc/rpkg.conf | 0 .../beaker-tests}/files/etc/rpkg/fedpkg.conf | 0 .../beaker-tests}/files/etc/rpkg/rhpkg.conf | 0 .../pkgs-files/lookaside-upload.conf | 0 .../beaker-tests}/pkgs-files/ssl.conf | 0 .../beaker-tests}/run.sh | 0 .../beaker-tests}/setup.sh | 0 .../tests/basic-test/dist-git.conf | 0 .../beaker-tests}/tests/basic-test/run.sh | 0 .../direct-test/dist-git-no-namespace.conf | 0 .../tests/direct-test/dist-git.conf | 0 .../beaker-tests}/tests/direct-test/run.sh | 0 .../fedpkg-lookaside_dir-test/dist-git.conf | 0 .../tests/fedpkg-lookaside_dir-test/run.sh | 0 .../tests/fedpkg-test/dist-git.conf | 0 .../beaker-tests}/tests/fedpkg-test/run.sh | 0 .../dist-git-group-check-off.conf | 0 .../dist-git-group-check-on.conf | 0 .../dist-git-group-check-unset.conf | 0 .../tests/group-check-test/run.sh | 0 .../tests/rhpkg-test.disable/dist-git.conf | 0 .../tests/rhpkg-test.disable/run.sh | 0 .../beaker-tests}/tests/test-template/run.sh | 0 .../configs}/dist-git/dist-git.conf | 0 .../configs}/httpd/dist-git.conf | 0 .../httpd/dist-git/git-smart-http.conf | 0 .../dist-git/lookaside-upload.conf.example | 0 .../configs}/httpd/dist-git/lookaside.conf | 0 .../configs}/httpd/dist-git/manifest.conf | 0 .../configs}/systemd/dist-git-gc.service | 0 .../configs}/systemd/dist-git-gc.timer | 0 .../configs}/systemd/dist-git.socket | 0 .../configs}/systemd/dist-git@.service | 0 dist-git.spec => dist-git/dist-git.spec | 0 .../docs}/scripts/httpd/dist-git-stg.conf | 0 .../docs}/scripts/httpd/upload-rh.cgi | 0 .../images}/server-communication.png | Bin {images => dist-git/images}/storage.png | Bin {images => dist-git/images}/tutorial.png | Bin .../scripts}/dist-git/dist-git-gc | 0 .../scripts}/dist-git/hooks/grok_update | 0 .../scripts}/dist-git/hooks/post-receive | 0 .../scripts}/dist-git/mkbranch | 0 .../scripts}/dist-git/mkbranch_branching | 0 .../scripts}/dist-git/remove_unused_sources | 0 .../scripts}/dist-git/setup_git_package | 0 .../scripts}/httpd/upload.cgi | 0 {selinux => dist-git/selinux}/dist_git.fc | 0 {selinux => dist-git/selinux}/dist_git.if | 0 {selinux => dist-git/selinux}/dist_git.te | 0 .../tests}/test_upload_script.py | 0 62 files changed, 143 insertions(+), 132 deletions(-) mode change 100644 => 120000 README.md rename COPYING => dist-git/COPYING (100%) rename LICENSE => dist-git/LICENSE (100%) create mode 100644 dist-git/README.md rename Vagrantfile => dist-git/Vagrantfile (100%) rename {beaker-tests => dist-git/beaker-tests}/Makefile (100%) rename {beaker-tests => dist-git/beaker-tests}/PURPOSE (100%) rename {beaker-tests => dist-git/beaker-tests}/README.md (100%) rename {beaker-tests => dist-git/beaker-tests}/data/prunerepo-1.1-1.fc23.src.rpm (100%) rename {beaker-tests => dist-git/beaker-tests}/files/etc/rpkg.conf (100%) rename {beaker-tests => dist-git/beaker-tests}/files/etc/rpkg/fedpkg.conf (100%) rename {beaker-tests => dist-git/beaker-tests}/files/etc/rpkg/rhpkg.conf (100%) rename {beaker-tests => dist-git/beaker-tests}/pkgs-files/lookaside-upload.conf (100%) rename {beaker-tests => dist-git/beaker-tests}/pkgs-files/ssl.conf (100%) rename {beaker-tests => dist-git/beaker-tests}/run.sh (100%) rename {beaker-tests => dist-git/beaker-tests}/setup.sh (100%) rename {beaker-tests => dist-git/beaker-tests}/tests/basic-test/dist-git.conf (100%) rename {beaker-tests => dist-git/beaker-tests}/tests/basic-test/run.sh (100%) rename {beaker-tests => dist-git/beaker-tests}/tests/direct-test/dist-git-no-namespace.conf (100%) rename {beaker-tests => dist-git/beaker-tests}/tests/direct-test/dist-git.conf (100%) rename {beaker-tests => dist-git/beaker-tests}/tests/direct-test/run.sh (100%) rename {beaker-tests => dist-git/beaker-tests}/tests/fedpkg-lookaside_dir-test/dist-git.conf (100%) rename {beaker-tests => dist-git/beaker-tests}/tests/fedpkg-lookaside_dir-test/run.sh (100%) rename {beaker-tests => dist-git/beaker-tests}/tests/fedpkg-test/dist-git.conf (100%) rename {beaker-tests => dist-git/beaker-tests}/tests/fedpkg-test/run.sh (100%) rename {beaker-tests => dist-git/beaker-tests}/tests/group-check-test/dist-git-group-check-off.conf (100%) rename {beaker-tests => dist-git/beaker-tests}/tests/group-check-test/dist-git-group-check-on.conf (100%) rename {beaker-tests => dist-git/beaker-tests}/tests/group-check-test/dist-git-group-check-unset.conf (100%) rename {beaker-tests => dist-git/beaker-tests}/tests/group-check-test/run.sh (100%) rename {beaker-tests => dist-git/beaker-tests}/tests/rhpkg-test.disable/dist-git.conf (100%) rename {beaker-tests => dist-git/beaker-tests}/tests/rhpkg-test.disable/run.sh (100%) rename {beaker-tests => dist-git/beaker-tests}/tests/test-template/run.sh (100%) rename {configs => dist-git/configs}/dist-git/dist-git.conf (100%) rename {configs => dist-git/configs}/httpd/dist-git.conf (100%) rename {configs => dist-git/configs}/httpd/dist-git/git-smart-http.conf (100%) rename {configs => dist-git/configs}/httpd/dist-git/lookaside-upload.conf.example (100%) rename {configs => dist-git/configs}/httpd/dist-git/lookaside.conf (100%) rename {configs => dist-git/configs}/httpd/dist-git/manifest.conf (100%) rename {configs => dist-git/configs}/systemd/dist-git-gc.service (100%) rename {configs => dist-git/configs}/systemd/dist-git-gc.timer (100%) rename {configs => dist-git/configs}/systemd/dist-git.socket (100%) rename {configs => dist-git/configs}/systemd/dist-git@.service (100%) rename dist-git.spec => dist-git/dist-git.spec (100%) rename {docs => dist-git/docs}/scripts/httpd/dist-git-stg.conf (100%) rename {docs => dist-git/docs}/scripts/httpd/upload-rh.cgi (100%) rename {images => dist-git/images}/server-communication.png (100%) rename {images => dist-git/images}/storage.png (100%) rename {images => dist-git/images}/tutorial.png (100%) rename {scripts => dist-git/scripts}/dist-git/dist-git-gc (100%) rename {scripts => dist-git/scripts}/dist-git/hooks/grok_update (100%) rename {scripts => dist-git/scripts}/dist-git/hooks/post-receive (100%) rename {scripts => dist-git/scripts}/dist-git/mkbranch (100%) rename {scripts => dist-git/scripts}/dist-git/mkbranch_branching (100%) rename {scripts => dist-git/scripts}/dist-git/remove_unused_sources (100%) rename {scripts => dist-git/scripts}/dist-git/setup_git_package (100%) rename {scripts => dist-git/scripts}/httpd/upload.cgi (100%) rename {selinux => dist-git/selinux}/dist_git.fc (100%) rename {selinux => dist-git/selinux}/dist_git.if (100%) rename {selinux => dist-git/selinux}/dist_git.te (100%) rename {tests => dist-git/tests}/test_upload_script.py (100%) diff --git a/.packit.yaml b/.packit.yaml index 4cfc177..496c263 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -1,23 +1,33 @@ # See the documentation for more information: # https://packit.dev/docs/configuration/ --- -specfile_path: dist-git.spec -upstream_package_name: dist-git -downstream_package_name: dist-git -upstream_tag_template: 'dist-git-{version}' -srpm_build_deps: - - tito - - git -actions: +upstream_project_url: https://github.com/release-engineering/dist-git + +actions: &common_actions create-archive: - bash -c "tito build --tgz --test -o ." - bash -c "ls -1t ./*.tar.gz | head -n 1" get-current-version: - - bash -c "git describe --match dist-git-[0-9]* --abbrev=0 HEAD | egrep -o [0-9]+\.[0-9]+" + - bash -c "grep -Po 'Version. +\K.*' *.spec" + +srpm_build_deps: + - tito + - git + +packages: + dist-git: + specfile_path: dist-git.spec + upstream_package_name: dist-git + downstream_package_name: dist-git + upstream_tag_template: 'dist-git-{version}' + paths: + - dist-git jobs: - &copr job: copr_build + packages: + - dist-git trigger: pull_request metadata: targets: diff --git a/.tito/packages/dist-git b/.tito/packages/dist-git index 8582692..79e2a99 100644 --- a/.tito/packages/dist-git +++ b/.tito/packages/dist-git @@ -1 +1 @@ -1.17-1 ./ +1.17-1 ./dist-git diff --git a/README.md b/README.md deleted file mode 100644 index 7ff81f9..0000000 --- a/README.md +++ /dev/null @@ -1,122 +0,0 @@ -DistGit -======= - -DistGit (Distribution Git) is Git with additional data storage. It is designed to hold content of source rpms and consists of these three main components: - - 1. Git repositories - 2. Lookaside cache to store source tarballs - 3. Scripts to manage both - -Read here for information about the most recent release: https://github.com/release-engineering/dist-git/wiki - -How Does It Work ----------------- - -RPM source package typically contains a spec file and the sources (upstream tarball + additional patches). Source tarballs, being binary and potentially large, are not very well suited to be placed in a Git repository. On each their update, Git would produce a huge, meaningless diff. That's why DistGit was introduced as it employs an efficient lookaside cache where the tarballs can be stored. The Git repo itself can then be left to do what it does best: keep track of changes on the spec file, downstream patches, and an additional text file called `sources` that contains link to the source tarball in the lookaside cache. - -![storage](/images/storage.png) - -Video Tutorial --------------- - -[![DistGit video tutorial](images/tutorial.png)](https://www.youtube.com/watch?v=VsnJymZRQOM "DistGit video tutorial") - -User Guide ----------- - -#### 1. Build and Install the Package: - -The project is prepared to be built as an RPM package. You can easily build it on [Fedora](https://getfedora.org/) or [CentOS](https://www.centos.org/) with EPEL7 enabled using a tool called [tito](https://github.com/rpm-software-management/tito). -To build the current release, use the following command in the repo directory: - -``` -$ tito build --rpm -``` - -Install the resulting RPM package: - -``` -# tito build --rpm -i -``` - -#### 2. Configuration: - -Enable the lookaside cache by using and modifying the example httpd config: - -``` -# cd /etc/httpd/conf.d/dist-git/ -# cp lookaside-upload.conf.example lookaside-upload.conf -# vim lookaside-upload.conf -``` - -Lookaside Cache uses https communication and client authenticates with ssl client certificate. The Dist Git service provider needs to issue the client certificate for every user. - -#### 3. Users and Groups: - -All DistGit users need to: - - 1. have an ssh server access with private key authentication - 2. be in a *packager* group on the server - 3. be provided with an ssl client certificate to authenticate with the lookaside cache - -#### 4. Install DistGit Web Interface: - -Install Cgit, the web interface for Git: - -``` -# dnf install cgit -``` - -And point it to the DistGit repositories: - -``` -echo "scan-path=/var/lib/dist-git/git/" >> /etc/cgitrc -``` - -It is useful to comment out `cache-size` entry in /etc/cgitrc (or set it to zero) to always get up-to-date repository state at each page refresh. - -The web interface will be available on address like `http://your-server/cgit`. - -#### 5. Systemd Services: - -``` -# systemctl start sshd -# systemctl start httpd -# systemctl start dist-git.socket -``` - -#### 6. DistGit client tools: - -To interact with DistGit server, you can use use [rpkg](https://pagure.io/rpkg-util) or [fedpkg](https://pagure.io/fedpkg) command-line tools. - -#### 7. Deployment - -You can see examples of Ansible deployment scripts in -[Fedora Infastructure dist-git role] and [Copr dist-git role]. - - -### Related - -* [Source-git](https://packit.dev/docs/source-git/) - project started in 2020. Intended as layer on top of dist-git. - -Developer Guide ---------------- - -#### Unit tests - -``` -$ pytest -v . -``` - -#### Integration tests - -Please, see `beaker-tests/README.md`. - -LICENSE -------- - -Whole project use MIT license. File upload.cgi uses GPLv1. - - -[Fedora Infastructure dist-git role]: https://pagure.io/fedora-infra/ansible/blob/main/f/roles/distgit -[Copr dist-git role]: https://pagure.io/fedora-infra/ansible/blob/main/f/roles/copr/dist_git diff --git a/README.md b/README.md new file mode 120000 index 0000000..d62881c --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +dist-git/README.md \ No newline at end of file diff --git a/COPYING b/dist-git/COPYING similarity index 100% rename from COPYING rename to dist-git/COPYING diff --git a/LICENSE b/dist-git/LICENSE similarity index 100% rename from LICENSE rename to dist-git/LICENSE diff --git a/dist-git/README.md b/dist-git/README.md new file mode 100644 index 0000000..7ff81f9 --- /dev/null +++ b/dist-git/README.md @@ -0,0 +1,122 @@ +DistGit +======= + +DistGit (Distribution Git) is Git with additional data storage. It is designed to hold content of source rpms and consists of these three main components: + + 1. Git repositories + 2. Lookaside cache to store source tarballs + 3. Scripts to manage both + +Read here for information about the most recent release: https://github.com/release-engineering/dist-git/wiki + +How Does It Work +---------------- + +RPM source package typically contains a spec file and the sources (upstream tarball + additional patches). Source tarballs, being binary and potentially large, are not very well suited to be placed in a Git repository. On each their update, Git would produce a huge, meaningless diff. That's why DistGit was introduced as it employs an efficient lookaside cache where the tarballs can be stored. The Git repo itself can then be left to do what it does best: keep track of changes on the spec file, downstream patches, and an additional text file called `sources` that contains link to the source tarball in the lookaside cache. + +![storage](/images/storage.png) + +Video Tutorial +-------------- + +[![DistGit video tutorial](images/tutorial.png)](https://www.youtube.com/watch?v=VsnJymZRQOM "DistGit video tutorial") + +User Guide +---------- + +#### 1. Build and Install the Package: + +The project is prepared to be built as an RPM package. You can easily build it on [Fedora](https://getfedora.org/) or [CentOS](https://www.centos.org/) with EPEL7 enabled using a tool called [tito](https://github.com/rpm-software-management/tito). +To build the current release, use the following command in the repo directory: + +``` +$ tito build --rpm +``` + +Install the resulting RPM package: + +``` +# tito build --rpm -i +``` + +#### 2. Configuration: + +Enable the lookaside cache by using and modifying the example httpd config: + +``` +# cd /etc/httpd/conf.d/dist-git/ +# cp lookaside-upload.conf.example lookaside-upload.conf +# vim lookaside-upload.conf +``` + +Lookaside Cache uses https communication and client authenticates with ssl client certificate. The Dist Git service provider needs to issue the client certificate for every user. + +#### 3. Users and Groups: + +All DistGit users need to: + + 1. have an ssh server access with private key authentication + 2. be in a *packager* group on the server + 3. be provided with an ssl client certificate to authenticate with the lookaside cache + +#### 4. Install DistGit Web Interface: + +Install Cgit, the web interface for Git: + +``` +# dnf install cgit +``` + +And point it to the DistGit repositories: + +``` +echo "scan-path=/var/lib/dist-git/git/" >> /etc/cgitrc +``` + +It is useful to comment out `cache-size` entry in /etc/cgitrc (or set it to zero) to always get up-to-date repository state at each page refresh. + +The web interface will be available on address like `http://your-server/cgit`. + +#### 5. Systemd Services: + +``` +# systemctl start sshd +# systemctl start httpd +# systemctl start dist-git.socket +``` + +#### 6. DistGit client tools: + +To interact with DistGit server, you can use use [rpkg](https://pagure.io/rpkg-util) or [fedpkg](https://pagure.io/fedpkg) command-line tools. + +#### 7. Deployment + +You can see examples of Ansible deployment scripts in +[Fedora Infastructure dist-git role] and [Copr dist-git role]. + + +### Related + +* [Source-git](https://packit.dev/docs/source-git/) - project started in 2020. Intended as layer on top of dist-git. + +Developer Guide +--------------- + +#### Unit tests + +``` +$ pytest -v . +``` + +#### Integration tests + +Please, see `beaker-tests/README.md`. + +LICENSE +------- + +Whole project use MIT license. File upload.cgi uses GPLv1. + + +[Fedora Infastructure dist-git role]: https://pagure.io/fedora-infra/ansible/blob/main/f/roles/distgit +[Copr dist-git role]: https://pagure.io/fedora-infra/ansible/blob/main/f/roles/copr/dist_git diff --git a/Vagrantfile b/dist-git/Vagrantfile similarity index 100% rename from Vagrantfile rename to dist-git/Vagrantfile diff --git a/beaker-tests/Makefile b/dist-git/beaker-tests/Makefile similarity index 100% rename from beaker-tests/Makefile rename to dist-git/beaker-tests/Makefile diff --git a/beaker-tests/PURPOSE b/dist-git/beaker-tests/PURPOSE similarity index 100% rename from beaker-tests/PURPOSE rename to dist-git/beaker-tests/PURPOSE diff --git a/beaker-tests/README.md b/dist-git/beaker-tests/README.md similarity index 100% rename from beaker-tests/README.md rename to dist-git/beaker-tests/README.md diff --git a/beaker-tests/data/prunerepo-1.1-1.fc23.src.rpm b/dist-git/beaker-tests/data/prunerepo-1.1-1.fc23.src.rpm similarity index 100% rename from beaker-tests/data/prunerepo-1.1-1.fc23.src.rpm rename to dist-git/beaker-tests/data/prunerepo-1.1-1.fc23.src.rpm diff --git a/beaker-tests/files/etc/rpkg.conf b/dist-git/beaker-tests/files/etc/rpkg.conf similarity index 100% rename from beaker-tests/files/etc/rpkg.conf rename to dist-git/beaker-tests/files/etc/rpkg.conf diff --git a/beaker-tests/files/etc/rpkg/fedpkg.conf b/dist-git/beaker-tests/files/etc/rpkg/fedpkg.conf similarity index 100% rename from beaker-tests/files/etc/rpkg/fedpkg.conf rename to dist-git/beaker-tests/files/etc/rpkg/fedpkg.conf diff --git a/beaker-tests/files/etc/rpkg/rhpkg.conf b/dist-git/beaker-tests/files/etc/rpkg/rhpkg.conf similarity index 100% rename from beaker-tests/files/etc/rpkg/rhpkg.conf rename to dist-git/beaker-tests/files/etc/rpkg/rhpkg.conf diff --git a/beaker-tests/pkgs-files/lookaside-upload.conf b/dist-git/beaker-tests/pkgs-files/lookaside-upload.conf similarity index 100% rename from beaker-tests/pkgs-files/lookaside-upload.conf rename to dist-git/beaker-tests/pkgs-files/lookaside-upload.conf diff --git a/beaker-tests/pkgs-files/ssl.conf b/dist-git/beaker-tests/pkgs-files/ssl.conf similarity index 100% rename from beaker-tests/pkgs-files/ssl.conf rename to dist-git/beaker-tests/pkgs-files/ssl.conf diff --git a/beaker-tests/run.sh b/dist-git/beaker-tests/run.sh similarity index 100% rename from beaker-tests/run.sh rename to dist-git/beaker-tests/run.sh diff --git a/beaker-tests/setup.sh b/dist-git/beaker-tests/setup.sh similarity index 100% rename from beaker-tests/setup.sh rename to dist-git/beaker-tests/setup.sh diff --git a/beaker-tests/tests/basic-test/dist-git.conf b/dist-git/beaker-tests/tests/basic-test/dist-git.conf similarity index 100% rename from beaker-tests/tests/basic-test/dist-git.conf rename to dist-git/beaker-tests/tests/basic-test/dist-git.conf diff --git a/beaker-tests/tests/basic-test/run.sh b/dist-git/beaker-tests/tests/basic-test/run.sh similarity index 100% rename from beaker-tests/tests/basic-test/run.sh rename to dist-git/beaker-tests/tests/basic-test/run.sh diff --git a/beaker-tests/tests/direct-test/dist-git-no-namespace.conf b/dist-git/beaker-tests/tests/direct-test/dist-git-no-namespace.conf similarity index 100% rename from beaker-tests/tests/direct-test/dist-git-no-namespace.conf rename to dist-git/beaker-tests/tests/direct-test/dist-git-no-namespace.conf diff --git a/beaker-tests/tests/direct-test/dist-git.conf b/dist-git/beaker-tests/tests/direct-test/dist-git.conf similarity index 100% rename from beaker-tests/tests/direct-test/dist-git.conf rename to dist-git/beaker-tests/tests/direct-test/dist-git.conf diff --git a/beaker-tests/tests/direct-test/run.sh b/dist-git/beaker-tests/tests/direct-test/run.sh similarity index 100% rename from beaker-tests/tests/direct-test/run.sh rename to dist-git/beaker-tests/tests/direct-test/run.sh diff --git a/beaker-tests/tests/fedpkg-lookaside_dir-test/dist-git.conf b/dist-git/beaker-tests/tests/fedpkg-lookaside_dir-test/dist-git.conf similarity index 100% rename from beaker-tests/tests/fedpkg-lookaside_dir-test/dist-git.conf rename to dist-git/beaker-tests/tests/fedpkg-lookaside_dir-test/dist-git.conf diff --git a/beaker-tests/tests/fedpkg-lookaside_dir-test/run.sh b/dist-git/beaker-tests/tests/fedpkg-lookaside_dir-test/run.sh similarity index 100% rename from beaker-tests/tests/fedpkg-lookaside_dir-test/run.sh rename to dist-git/beaker-tests/tests/fedpkg-lookaside_dir-test/run.sh diff --git a/beaker-tests/tests/fedpkg-test/dist-git.conf b/dist-git/beaker-tests/tests/fedpkg-test/dist-git.conf similarity index 100% rename from beaker-tests/tests/fedpkg-test/dist-git.conf rename to dist-git/beaker-tests/tests/fedpkg-test/dist-git.conf diff --git a/beaker-tests/tests/fedpkg-test/run.sh b/dist-git/beaker-tests/tests/fedpkg-test/run.sh similarity index 100% rename from beaker-tests/tests/fedpkg-test/run.sh rename to dist-git/beaker-tests/tests/fedpkg-test/run.sh diff --git a/beaker-tests/tests/group-check-test/dist-git-group-check-off.conf b/dist-git/beaker-tests/tests/group-check-test/dist-git-group-check-off.conf similarity index 100% rename from beaker-tests/tests/group-check-test/dist-git-group-check-off.conf rename to dist-git/beaker-tests/tests/group-check-test/dist-git-group-check-off.conf diff --git a/beaker-tests/tests/group-check-test/dist-git-group-check-on.conf b/dist-git/beaker-tests/tests/group-check-test/dist-git-group-check-on.conf similarity index 100% rename from beaker-tests/tests/group-check-test/dist-git-group-check-on.conf rename to dist-git/beaker-tests/tests/group-check-test/dist-git-group-check-on.conf diff --git a/beaker-tests/tests/group-check-test/dist-git-group-check-unset.conf b/dist-git/beaker-tests/tests/group-check-test/dist-git-group-check-unset.conf similarity index 100% rename from beaker-tests/tests/group-check-test/dist-git-group-check-unset.conf rename to dist-git/beaker-tests/tests/group-check-test/dist-git-group-check-unset.conf diff --git a/beaker-tests/tests/group-check-test/run.sh b/dist-git/beaker-tests/tests/group-check-test/run.sh similarity index 100% rename from beaker-tests/tests/group-check-test/run.sh rename to dist-git/beaker-tests/tests/group-check-test/run.sh diff --git a/beaker-tests/tests/rhpkg-test.disable/dist-git.conf b/dist-git/beaker-tests/tests/rhpkg-test.disable/dist-git.conf similarity index 100% rename from beaker-tests/tests/rhpkg-test.disable/dist-git.conf rename to dist-git/beaker-tests/tests/rhpkg-test.disable/dist-git.conf diff --git a/beaker-tests/tests/rhpkg-test.disable/run.sh b/dist-git/beaker-tests/tests/rhpkg-test.disable/run.sh similarity index 100% rename from beaker-tests/tests/rhpkg-test.disable/run.sh rename to dist-git/beaker-tests/tests/rhpkg-test.disable/run.sh diff --git a/beaker-tests/tests/test-template/run.sh b/dist-git/beaker-tests/tests/test-template/run.sh similarity index 100% rename from beaker-tests/tests/test-template/run.sh rename to dist-git/beaker-tests/tests/test-template/run.sh diff --git a/configs/dist-git/dist-git.conf b/dist-git/configs/dist-git/dist-git.conf similarity index 100% rename from configs/dist-git/dist-git.conf rename to dist-git/configs/dist-git/dist-git.conf diff --git a/configs/httpd/dist-git.conf b/dist-git/configs/httpd/dist-git.conf similarity index 100% rename from configs/httpd/dist-git.conf rename to dist-git/configs/httpd/dist-git.conf diff --git a/configs/httpd/dist-git/git-smart-http.conf b/dist-git/configs/httpd/dist-git/git-smart-http.conf similarity index 100% rename from configs/httpd/dist-git/git-smart-http.conf rename to dist-git/configs/httpd/dist-git/git-smart-http.conf diff --git a/configs/httpd/dist-git/lookaside-upload.conf.example b/dist-git/configs/httpd/dist-git/lookaside-upload.conf.example similarity index 100% rename from configs/httpd/dist-git/lookaside-upload.conf.example rename to dist-git/configs/httpd/dist-git/lookaside-upload.conf.example diff --git a/configs/httpd/dist-git/lookaside.conf b/dist-git/configs/httpd/dist-git/lookaside.conf similarity index 100% rename from configs/httpd/dist-git/lookaside.conf rename to dist-git/configs/httpd/dist-git/lookaside.conf diff --git a/configs/httpd/dist-git/manifest.conf b/dist-git/configs/httpd/dist-git/manifest.conf similarity index 100% rename from configs/httpd/dist-git/manifest.conf rename to dist-git/configs/httpd/dist-git/manifest.conf diff --git a/configs/systemd/dist-git-gc.service b/dist-git/configs/systemd/dist-git-gc.service similarity index 100% rename from configs/systemd/dist-git-gc.service rename to dist-git/configs/systemd/dist-git-gc.service diff --git a/configs/systemd/dist-git-gc.timer b/dist-git/configs/systemd/dist-git-gc.timer similarity index 100% rename from configs/systemd/dist-git-gc.timer rename to dist-git/configs/systemd/dist-git-gc.timer diff --git a/configs/systemd/dist-git.socket b/dist-git/configs/systemd/dist-git.socket similarity index 100% rename from configs/systemd/dist-git.socket rename to dist-git/configs/systemd/dist-git.socket diff --git a/configs/systemd/dist-git@.service b/dist-git/configs/systemd/dist-git@.service similarity index 100% rename from configs/systemd/dist-git@.service rename to dist-git/configs/systemd/dist-git@.service diff --git a/dist-git.spec b/dist-git/dist-git.spec similarity index 100% rename from dist-git.spec rename to dist-git/dist-git.spec diff --git a/docs/scripts/httpd/dist-git-stg.conf b/dist-git/docs/scripts/httpd/dist-git-stg.conf similarity index 100% rename from docs/scripts/httpd/dist-git-stg.conf rename to dist-git/docs/scripts/httpd/dist-git-stg.conf diff --git a/docs/scripts/httpd/upload-rh.cgi b/dist-git/docs/scripts/httpd/upload-rh.cgi similarity index 100% rename from docs/scripts/httpd/upload-rh.cgi rename to dist-git/docs/scripts/httpd/upload-rh.cgi diff --git a/images/server-communication.png b/dist-git/images/server-communication.png similarity index 100% rename from images/server-communication.png rename to dist-git/images/server-communication.png diff --git a/images/storage.png b/dist-git/images/storage.png similarity index 100% rename from images/storage.png rename to dist-git/images/storage.png diff --git a/images/tutorial.png b/dist-git/images/tutorial.png similarity index 100% rename from images/tutorial.png rename to dist-git/images/tutorial.png diff --git a/scripts/dist-git/dist-git-gc b/dist-git/scripts/dist-git/dist-git-gc similarity index 100% rename from scripts/dist-git/dist-git-gc rename to dist-git/scripts/dist-git/dist-git-gc diff --git a/scripts/dist-git/hooks/grok_update b/dist-git/scripts/dist-git/hooks/grok_update similarity index 100% rename from scripts/dist-git/hooks/grok_update rename to dist-git/scripts/dist-git/hooks/grok_update diff --git a/scripts/dist-git/hooks/post-receive b/dist-git/scripts/dist-git/hooks/post-receive similarity index 100% rename from scripts/dist-git/hooks/post-receive rename to dist-git/scripts/dist-git/hooks/post-receive diff --git a/scripts/dist-git/mkbranch b/dist-git/scripts/dist-git/mkbranch similarity index 100% rename from scripts/dist-git/mkbranch rename to dist-git/scripts/dist-git/mkbranch diff --git a/scripts/dist-git/mkbranch_branching b/dist-git/scripts/dist-git/mkbranch_branching similarity index 100% rename from scripts/dist-git/mkbranch_branching rename to dist-git/scripts/dist-git/mkbranch_branching diff --git a/scripts/dist-git/remove_unused_sources b/dist-git/scripts/dist-git/remove_unused_sources similarity index 100% rename from scripts/dist-git/remove_unused_sources rename to dist-git/scripts/dist-git/remove_unused_sources diff --git a/scripts/dist-git/setup_git_package b/dist-git/scripts/dist-git/setup_git_package similarity index 100% rename from scripts/dist-git/setup_git_package rename to dist-git/scripts/dist-git/setup_git_package diff --git a/scripts/httpd/upload.cgi b/dist-git/scripts/httpd/upload.cgi similarity index 100% rename from scripts/httpd/upload.cgi rename to dist-git/scripts/httpd/upload.cgi diff --git a/selinux/dist_git.fc b/dist-git/selinux/dist_git.fc similarity index 100% rename from selinux/dist_git.fc rename to dist-git/selinux/dist_git.fc diff --git a/selinux/dist_git.if b/dist-git/selinux/dist_git.if similarity index 100% rename from selinux/dist_git.if rename to dist-git/selinux/dist_git.if diff --git a/selinux/dist_git.te b/dist-git/selinux/dist_git.te similarity index 100% rename from selinux/dist_git.te rename to dist-git/selinux/dist_git.te diff --git a/tests/test_upload_script.py b/dist-git/tests/test_upload_script.py similarity index 100% rename from tests/test_upload_script.py rename to dist-git/tests/test_upload_script.py