File gitolite-rpm-system.patch of Package gitolite

Overview Repositories Revisions Requests Users Attributes Meta

File gitolite-rpm-system.patch of Package gitolite

Index: hooks/gitolite-admin/post-update
===================================================================
--- hooks/gitolite-admin/post-update.orig
+++ hooks/gitolite-admin/post-update
@@ -21,7 +21,7 @@ GIT_WORK_TREE=$GL_ADMINDIR git checkout
 
 od=$PWD
 cd $GL_ADMINDIR
-$GL_BINDIR/gl-compile-conf
+gl-compile-conf
 
 cd $od
 
Index: src/gl-setup
===================================================================
--- src/gl-setup.orig
+++ src/gl-setup
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-GL_PACKAGE_CONF=/tmp/share/gitolite/conf
+GL_PACKAGE_CONF=/usr/share/gitolite/conf
 # must be the same as the value for the same variable in
 # $GL_PACKAGE_CONF/example.gitolite.rc.  Sorry about the catch-22 :)
 
@@ -137,10 +137,9 @@ fi
 # authkeys etc., because in this case it seems appropriate
 (
     cd $HOME
-    mkdir -p .ssh
-    chmod go-rwx .ssh
-    touch .ssh/authorized_keys
-    chmod go-w . .ssh .ssh/authorized_keys
+    [ ! -d .ssh ] && install -d 0700 .ssh;
+    [ ! -f .ssh/authorized_keys ] && {
+      touch .ssh/authorized_keys; }
 )
 
 # ----------------------------------------------------------------------
@@ -171,7 +170,6 @@ gl-install -q
 }
 [ -n "$pubkey_file" ] && cp $pubkey_file $GL_ADMINDIR/keydir
 
-touch $HOME/.ssh/authorized_keys
 gl-compile-conf -q
 
 # setup the admin repo
Index: src/gl-system-install
===================================================================
--- src/gl-system-install.orig
+++ src/gl-system-install
@@ -28,7 +28,7 @@ chdir( $FindBin::Bin . "/.." ) or die "c
 system("cp src/* $bin_dir") and die "cp src/* to $bin_dir failed";
 
 # fixup GL_PACKAGE_CONF in gl-setup
-replace( "/tmp/share/gitolite/conf", $conf_dir, "$bin_dir/gl-setup" );
+replace( "/usr/share/gitolite/conf", $conf_dir, "$bin_dir/gl-setup" );
 
 # record which version is being sent across; we assume it's HEAD
 record_version();
@@ -37,8 +37,8 @@ record_version();
 system("cp -R conf/* $conf_dir") and die "cp conf/* to $conf_dir failed";
 
 # fixup GL_PACKAGE_CONF and GL_PACKAGE_HOOKS in the example rc
-replace( "/tmp/share/gitolite/conf",  $conf_dir,  "$conf_dir/example.gitolite.rc" );
-replace( "/tmp/share/gitolite/hooks", $hooks_dir, "$conf_dir/example.gitolite.rc" );
+replace( "/usr/share/gitolite/conf",  $conf_dir,  "$conf_dir/example.gitolite.rc" );
+replace( "/usr/share/gitolite/hooks", $hooks_dir, "$conf_dir/example.gitolite.rc" );
 
 # copy hooks
 system("cp -R hooks/* $hooks_dir") and die "cp hooks/* to $hooks_dir failed";
@@ -63,7 +63,7 @@ sub argv_or_defaults {
     unless (@ARGV) {
         my $HOME = $ENV{HOME};
         if ( $EUID eq "0" ) {
-            ( $bin_dir, $conf_dir, $hooks_dir ) = qw(/usr/local/bin /var/gitolite/conf /var/gitolite/hooks);
+            ( $bin_dir, $conf_dir, $hooks_dir ) = qw(/usr/bin /usr/share/gitolite/conf /usr/share/gitolite/hooks);
         } else {
             ( $bin_dir, $conf_dir, $hooks_dir ) = ( "$HOME/bin", "$HOME/share/gitolite/conf", "$HOME/share/gitolite/hooks" );
         }
Index: conf/example.gitolite.rc
===================================================================
--- conf/example.gitolite.rc.orig
+++ conf/example.gitolite.rc
@@ -19,8 +19,8 @@ $GL_CONF_COMPILED="$GL_ADMINDIR/conf/git
 # DO NOT CHANGE THE NEXT FOUR LINES UNLESS YOU REALLY KNOW WHAT YOU'RE DOING.
 # These variables are set automatically by the install method you choose.
 #            (PACKAGE MAINTAINERS: PLEASE READ doc/packaging.mkd)
-$GL_PACKAGE_CONF = "/tmp/share/gitolite/conf";
-$GL_PACKAGE_HOOKS = "/tmp/share/gitolite/hooks";
+$GL_PACKAGE_CONF = "/usr/share/gitolite/conf";
+$GL_PACKAGE_HOOKS = "/usr/share/gitolite/hooks";
 
 # ------------------------------------------------------------------------------
 # most often used/changed variables

Places

File gitolite-rpm-system.patch of Package gitolite

Places