mirror of
https://github.com/release-engineering/dist-git.git
synced 2025-02-23 23:12:55 +00:00
return back /var/lib/dist-git path for saving data
This commit is contained in:
parent
c872c4032e
commit
ff09d2de55
11 changed files with 19 additions and 19 deletions
|
@ -1,4 +1,4 @@
|
||||||
SetEnv GIT_PROJECT_ROOT /srv/git/repositories
|
SetEnv GIT_PROJECT_ROOT /var/lib/dist-git/git/repositories
|
||||||
SetEnv GIT_HTTP_EXPORT_ALL
|
SetEnv GIT_HTTP_EXPORT_ALL
|
||||||
ScriptAlias /git/ /usr/libexec/git-core/git-http-backend/
|
ScriptAlias /git/ /usr/libexec/git-core/git-http-backend/
|
||||||
|
|
||||||
|
|
|
@ -13,9 +13,9 @@ SSLCryptoDevice builtin
|
||||||
# SSL host
|
# SSL host
|
||||||
<VirtualHost _default_:443>
|
<VirtualHost _default_:443>
|
||||||
# This alias must come before the /repo/ one to avoid being overridden.
|
# 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.example.org
|
ServerName pkgs.example.org
|
||||||
ServerAdmin webmaster@fedoraproject.org
|
ServerAdmin webmaster@fedoraproject.org
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
Alias /lookaside /srv/cache/lookaside
|
Alias /lookaside /var/lib/dist-git/cache/lookaside
|
||||||
Alias /repo /srv/cache/lookaside
|
Alias /repo /var/lib/dist-git/cache/lookaside
|
||||||
<Directory /srv/cache/lookaside>
|
<Directory /var/lib/dist-git/cache/lookaside>
|
||||||
Options Indexes FollowSymLinks
|
Options Indexes FollowSymLinks
|
||||||
AllowOverride None
|
AllowOverride None
|
||||||
Require all granted
|
Require all granted
|
||||||
|
|
|
@ -5,5 +5,5 @@ Wants=dist-git.socket
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
User=nobody
|
User=nobody
|
||||||
ExecStart=/usr/libexec/git-core/git-daemon --base-path=/srv/git/repositories --export-all --user-path=public_git --syslog --inetd --verbose
|
ExecStart=/usr/libexec/git-core/git-daemon --base-path=/var/lib/dist-git/git/repositories --export-all --user-path=public_git --syslog --inetd --verbose
|
||||||
StandardInput=socket
|
StandardInput=socket
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
%global selinux_variants mls targeted
|
%global selinux_variants mls targeted
|
||||||
%global selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp || echo 0.0.0)
|
%global selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp || echo 0.0.0)
|
||||||
%global modulename dist_git
|
%global modulename dist_git
|
||||||
%global installdir /srv
|
%global installdir /var/lib/dist-git
|
||||||
|
|
||||||
Name: dist-git
|
Name: dist-git
|
||||||
Version: 0.13
|
Version: 0.13
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
# Looking for git repos.
|
# Looking for git repos.
|
||||||
#
|
#
|
||||||
|
|
||||||
destination=/srv/git/pkgs-git-repos-list
|
destination=/var/lib/dist-git/git/pkgs-git-repos-list
|
||||||
|
|
||||||
if [ -n "$1" ]
|
if [ -n "$1" ]
|
||||||
then
|
then
|
||||||
|
@ -15,7 +15,7 @@ fi
|
||||||
|
|
||||||
newfile=`mktemp`
|
newfile=`mktemp`
|
||||||
|
|
||||||
cd /srv/git/repositories
|
cd /var/lib/dist-git/git/repositories
|
||||||
ls > $newfile
|
ls > $newfile
|
||||||
cp -fZ $newfile $destination
|
cp -fZ $newfile $destination
|
||||||
rm $newfile
|
rm $newfile
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
# Figure out the environment we're running in
|
# Figure out the environment we're running in
|
||||||
RUNDIR=$(cd $(dirname $0) && pwd)
|
RUNDIR=$(cd $(dirname $0) && pwd)
|
||||||
GITROOT=/srv/git/repositories
|
GITROOT=/var/lib/dist-git/git/repositories
|
||||||
|
|
||||||
# check if a moron is driving me
|
# check if a moron is driving me
|
||||||
if [ ! -d $GITROOT ] ; then
|
if [ ! -d $GITROOT ] ; then
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
# Figure out the environment we're running in
|
# Figure out the environment we're running in
|
||||||
RUNDIR=$(cd $(dirname $0) && pwd)
|
RUNDIR=$(cd $(dirname $0) && pwd)
|
||||||
GITROOT=/srv/git/repositories
|
GITROOT=/var/lib/dist-git/git/repositories
|
||||||
|
|
||||||
# check if a moron is driving me
|
# check if a moron is driving me
|
||||||
if [ ! -d $GITROOT ] ; then
|
if [ ! -d $GITROOT ] ; then
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
|
|
||||||
# Figure out the environment we're running in
|
# Figure out the environment we're running in
|
||||||
GITROOT=/srv/git/repositories
|
GITROOT=/var/lib/dist-git/git/repositories
|
||||||
|
|
||||||
# check if a moron is driving me
|
# check if a moron is driving me
|
||||||
if [ ! -d $GITROOT ] ; then
|
if [ ! -d $GITROOT ] ; then
|
||||||
|
|
|
@ -22,10 +22,10 @@ import fedmsg.config
|
||||||
BUFFER_SIZE = 4096
|
BUFFER_SIZE = 4096
|
||||||
|
|
||||||
# We check modules exist from this dircetory
|
# We check modules exist from this dircetory
|
||||||
GITREPO = '/srv/git/repositories'
|
GITREPO = '/var/lib/dist-git/git/repositories'
|
||||||
|
|
||||||
# Lookaside cache directory
|
# Lookaside cache directory
|
||||||
CACHE_DIR = '/srv/cache/lookaside/pkgs'
|
CACHE_DIR = '/var/lib/dist-git/cache/lookaside/pkgs'
|
||||||
|
|
||||||
# Fedora Packager Group
|
# Fedora Packager Group
|
||||||
PACKAGER_GROUP = 'packager'
|
PACKAGER_GROUP = 'packager'
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/srv/git(/.*)? gen_context(system_u:object_r:git_user_content_t,s0)
|
/var/lib/dist-git/git(/.*)? gen_context(system_u:object_r:git_user_content_t,s0)
|
||||||
/srv/git/pkgs-git-repos-list gen_context(system_u:object_r:git_content_t,s0)
|
/var/lib/dist-git/git/pkgs-git-repos-list gen_context(system_u:object_r:git_content_t,s0)
|
||||||
/srv/cache(/.*)? gen_context(system_u:object_r:git_rw_content_t,s0)
|
/var/lib/dist-git/cache(/.*)? gen_context(system_u:object_r:git_rw_content_t,s0)
|
||||||
/srv/web/upload.cgi gen_context(system_u:object_r:git_script_exec_t,s0)
|
/var/lib/dist-git/web/upload.cgi gen_context(system_u:object_r:git_script_exec_t,s0)
|
||||||
|
|
Loading…
Add table
Reference in a new issue