release-engineering/dist-git
1
0
Fork 0
mirror of https://github.com/release-engineering/dist-git.git synced 2025-02-23 23:12:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

/srv -> /var/lib/dist-git

Browse source
This commit is contained in:
Adam Samalik 2015-03-26 14:39:39 +01:00
parent 4884671202
commit 05627c36c6
12 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
files/cgitrc
View file

@ -67,5 +67,5 @@ mimetype.svg=image/svg+xml
## displayed under a section heading
## PPS: This list could be kept in a different file (e.g. '/etc/cgitrepos')
## and included like this:
project-list=/srv/git/pkgs-git-repos-list
scan-path=/srv/git/rpms/
project-list=/var/lib/dist-git/git/pkgs-git-repos-list
scan-path=/var/lib/dist-git/git/rpms/

6
files/dist-git-upload.cgi
View file

@ -32,10 +32,10 @@ import hashlib
BUFFER_SIZE = 4096
# We check modules exist from this dircetory
GITREPO = '/srv/git/rpms'
GITREPO = '/var/lib/dist-git/git/rpms'
# Lookaside cache directory
CACHE_DIR = '/srv/cache/lookaside/pkgs'
CACHE_DIR = '/var/lib/dist-git/cache/lookaside/pkgs'
# Fedora Packager Group
PACKAGER_GROUP = 'packager'
@ -174,7 +174,7 @@ def main():
hash_dir = os.path.join(module_dir, filename, checksum)
msgpath = os.path.join(name, module_dir, filename, checksum, filename)
unwanted_prefix = '/srv/cache/lookaside/pkgs/'
unwanted_prefix = '/var/lib/dist-git/cache/lookaside/pkgs/'
if msgpath.startswith(unwanted_prefix):
msgpath = msgpath[len(unwanted_prefix):]

6
files/dist_git_main.conf
View file

@ -3,6 +3,8 @@
# 2.
# TODO:
# - how often should we sync repos? (genacls.sh)
[acls]
@ -24,7 +26,7 @@ reserved_branches=f[0-9][0-9],epel[0-9],epel[0-9][0-9],el[0-9],olpc[0-9]
# url of package database - acls (data in json format)
# default: https://admin.fedoraproject.org/pkgdb/api/vcs?format=json
pkgdb_acls_url=https://admin.fedoraproject.org/pkgdb/api/vcs?format=json
pkgdb_acls_url=http://192.168.122.1:5000/
# url of package database - groups (data in json format)
# default: https://admin.fedoraproject.org/pkgdb/api/groups?format=json
@ -49,5 +51,5 @@ pkg_owner_emails=$PACKAGE-owner@fedoraproject.org,scm-commits@lists.fedoraprojec
# the default author of git branches
# default: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
default_branch_author=Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
default_branch_author=the coolness <hellooo@here.example.com>

2
files/genacls.sh
View file

@ -10,7 +10,7 @@ cd $TEMPDIR
if /usr/local/bin/genacls.pkgdb > gitolite.conf ; then
mv gitolite.conf /etc/gitolite/conf/
chown gen-acls:gen-acls -R /etc/gitolite/conf/
HOME=/srv/git /usr/bin/gitolite compile
HOME=/var/lib/dist-git/git /usr/bin/gitolite compile
fi
cd /
rm -rf $TEMPDIR

2
files/git-smart-http.conf
View file

@ -1,3 +1,3 @@
SetEnv GIT_PROJECT_ROOT /srv/git/rpms
SetEnv GIT_PROJECT_ROOT /var/lib/dist-git/git/rpms
SetEnv GIT_HTTP_EXPORT_ALL
ScriptAlias /git/ /usr/libexec/git-core/git-http-backend/

2
files/git@.service
View file

@ -5,5 +5,5 @@ Wants=git.socket
[Service]
User=nobody
ExecStart=/usr/libexec/git-core/git-daemon --base-path=/srv/git/rpms --export-all --user-path=public_git --syslog --inetd --verbose
ExecStart=/usr/libexec/git-core/git-daemon --base-path=/var/lib/dist-git/git/rpms --export-all --user-path=public_git --syslog --inetd --verbose
StandardInput=socket

6
files/lookaside-upload.conf
View file

@ -1,4 +1,4 @@
Alias /repo/ /srv/cache/lookaside/
Alias /repo/ /var/lib/dist-git/cache/lookaside/
# default SSL configuration...
Listen 443
@ -15,9 +15,9 @@ SSLCryptoDevice builtin
# SSL host
<VirtualHost _default_:443>
# This alias must come before the /repo/ one to avoid being overridden.
ScriptAlias /repo/pkgs/upload.cgi /srv/web/upload.cgi
ScriptAlias /repo/pkgs/upload.cgi /var/lib/dist-git/web/upload.cgi
Alias /repo/ /srv/cache/lookaside/
Alias /repo/ /var/lib/dist-git/cache/lookaside/
ServerName pkgs.fedoraproject.org
ServerAdmin webmaster@fedoraproject.org

4
files/lookaside.conf
View file

@ -1,5 +1,5 @@
Alias /lookaside /srv/cache/lookaside
<Directory /srv/cache/lookaside>
Alias /lookaside /var/lib/dist-git/cache/lookaside
<Directory /var/lib/dist-git/cache/lookaside>
Options Indexes FollowSymLinks
AllowOverride None
Require all granted

8
files/make-cgit-pkgs-list.sh
View file

@ -7,8 +7,8 @@
#
newfile=`mktemp`
cd /srv/git/rpms
cd /var/lib/dist-git/git/rpms
ls > $newfile
mv -Z $newfile /srv/git/pkgs-git-repos-list
chown apache:apache /srv/git/pkgs-git-repos-list
chmod 644 /srv/git/pkgs-git-repos-list
mv -Z $newfile /var/lib/dist-git/git/pkgs-git-repos-list
chown apache:apache /var/lib/dist-git/git/pkgs-git-repos-list
chmod 644 /var/lib/dist-git/git/pkgs-git-repos-list

2
files/mkbranch
View file

@ -10,7 +10,7 @@
# Figure out the environment we're running in
RUNDIR=$(cd $(dirname $0) && pwd)
GITROOT=/srv/git/rpms
GITROOT=/var/lib/dist-git/git/rpms
# check if a moron is driving me
if [ ! -d $GITROOT ] ; then

2
files/pkgdb_sync_git_branches.py
View file

@ -58,7 +58,7 @@ DEFAULT_BRANCH_AUTHOR = _get_conf(config, "git", "default_branch_author",
"Fedora Release Engineering <rel-eng@lists.fedoraproject.org>")
GIT_FOLDER = '/srv/git/rpms/'
GIT_FOLDER = '/var/lib/dist-git/git/rpms/'
MKBRANCH = '/usr/local/bin/mkbranch'
SETUP_PACKAGE = '/usr/local/bin/setup_git_package'

2
files/setup_git_package
View file

@ -10,7 +10,7 @@
# Figure out the environment we're running in
GITROOT=/srv/git/rpms
GITROOT=/var/lib/dist-git/git/rpms
# check if a moron is driving me
if [ ! -d $GITROOT ] ; then