webinterface.git

@@ -1,3 +0,0 @@

-sshkey

-sshkey.pub

-gitolite-admin

@@ -1,5 +0,0 @@

-#!/bin/bash

-

-export GIT_SSH="$(dirname ${0})/ssh-wrapper.sh"

-cd "$(dirname ${0})/gitolite-admin"

-git "${@}"

@@ -1,2 +0,0 @@

-#!/bin/bash

-/usr/bin/ssh -i "$(dirname ${0})/sshkey" "${@}"

@@ -16,12 +16,12 @@ Nevertheless, in case you use a significant part of this code, we ask (but not r

 require_role(ROLE_SYSTEMUSER);

-$data_dir = realpath(dirname(__FILE__).'/../data/');

+$data_dir = realpath(dirname(__FILE__).'/../../../../gitolite-data/');

 $config_file = $data_dir.'/gitolite-admin/conf/webinterface.conf';

 $config_dir = $data_dir.'/gitolite-admin/conf/webinterface';

 $key_dir = $data_dir.'/gitolite-admin/keydir';

 DEBUG("gitolite-data_dir: ".$data_dir);

-$git_wrapper = $data_dir . '/git-wrapper.sh';

+$git_wrapper = realpath(dirname(__FILE__).'/../scripts/git-wrapper.sh');

@@ -0,0 +1 @@

+Require all denied

@@ -0,0 +1,8 @@

+#!/bin/bash

+

+SCRIPTDIR="$(realpath "$(dirname ${0})")"

+WORKDIR="$(realpath "$SCRIPTDIR/../../../../gitolite-data")"

+

+export GIT_SSH="$SCRIPTDIR/ssh-wrapper.sh"

+cd "$WORKDIR/gitolite-admin"

+git "${@}"

@@ -1,22 +1,24 @@

 #!/bin/bash

-if [ -f "sshkey" ] ; then 

+SCRIPTDIR="$(realpath "$(dirname ${0})")"

+WORKDIR="$(realpath "$SCRIPTDIR/../../../../gitolite-data")"

+

+if [ -f "$WORKDIR/sshkey" ] ; then 

   echo 'SSH-Key exists!'

   exit 1

 fi

-WORKDIR="$(realpath "$(dirname ${0})")"

-

 ssh-keygen -t ecdsa -P '' -f "${WORKDIR}/sshkey"

 echo 'Paste the following public key in gitolite-config and allow it to access the gitolite-admin repository!'

 echo '----------------------'

-cat sshkey.pub

+cat "$WORKDIR/sshkey.pub"

 echo '----------------------'

 echo -n 'Press ENTER when ready...'

 read

-export GIT_SSH="${WORKDIR}/ssh-wrapper.sh"

+export GIT_SSH="$SCRIPTDIR/ssh-wrapper.sh"

+cd "$WORKDIR"

 git clone "git@git.$(hostname -d):gitolite-admin"

 cd "gitolite-admin"

@@ -0,0 +1,6 @@

+#!/bin/bash

+

+SCRIPTDIR="$(realpath "$(dirname ${0})")"

+WORKDIR="$(realpath "$SCRIPTDIR/../../../../gitolite-data")"

+

+/usr/bin/ssh -i "$WORKDIR/sshkey" "${@}"