Author: draenog                      Date: Mon Apr  2 13:12:38 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.4
- config files for gitweb and mailing lists

---- Files affected:
packages/pld-gitolite:
   gitolite.conf (1.1 -> 1.2) , gitolite.rc (1.1 -> 1.2) , pld-gitolite.spec 
(1.4 -> 1.5) , git.conf (NONE -> 1.1)  (NEW), gitweb.conf (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/pld-gitolite/gitolite.conf
diff -u packages/pld-gitolite/gitolite.conf:1.1 
packages/pld-gitolite/gitolite.conf:1.2
--- packages/pld-gitolite/gitolite.conf:1.1     Fri Dec 16 22:22:17 2011
+++ packages/pld-gitolite/gitolite.conf Mon Apr  2 15:12:33 2012
@@ -17,7 +17,7 @@
 
 repo   packages/..*
         C = @all
-        R = daemon
+        R = daemon gitweb
         RW refs/tags/auto-th = @th-builders
         RW refs/tags/auto-ac = @ac-builders
         RW refs/tags/auto-ti = @ti-builders

================================================================
Index: packages/pld-gitolite/gitolite.rc
diff -u packages/pld-gitolite/gitolite.rc:1.1 
packages/pld-gitolite/gitolite.rc:1.2
--- packages/pld-gitolite/gitolite.rc:1.1       Fri Dec 16 22:22:17 2011
+++ packages/pld-gitolite/gitolite.rc   Mon Apr  2 15:12:33 2012
@@ -29,13 +29,13 @@
 $PROJECTS_LIST = $ENV{HOME} . "/projects.list";
 # $WEB_INTERFACE = "gitweb";
 # $GITWEB_URI_ESCAPE = 0;
-$REPO_UMASK = 0077;
+$REPO_UMASK = 0027;
 
 # 
------------------------------------------------------------------------------
 # variables with an efficiency/performance impact
 # 
------------------------------------------------------------------------------
 $GL_BIG_CONFIG = 1;
-$GL_NO_DAEMON_NO_GITWEB = 1;
+$GL_NO_DAEMON_NO_GITWEB = 0;
 # $GL_NICE_VALUE = 0;
 # $BIG_INFO_CAP = 20;
 

================================================================
Index: packages/pld-gitolite/pld-gitolite.spec
diff -u packages/pld-gitolite/pld-gitolite.spec:1.4 
packages/pld-gitolite/pld-gitolite.spec:1.5
--- packages/pld-gitolite/pld-gitolite.spec:1.4 Sun Apr  1 09:47:02 2012
+++ packages/pld-gitolite/pld-gitolite.spec     Mon Apr  2 15:12:33 2012
@@ -1,14 +1,16 @@
 # $Revision$, $Date$
 Summary:       Gitolite setup used by PLD
 Name:          pld-gitolite
-Version:       0.3
+Version:       0.4
 Release:       1
 License:       GPL v2
 Group:         Development/Building
 Source0:       
https://github.com/draenog/gitolite-scripts/tarball/v%{version}/gitolite-scripts.tar.gz
-# Source0-md5: 7450fb7b27662a40b52d8ed813dc7879
+# Source0-md5: 1ea2745235e16c29126227b6d9115474
 Source1:       gitolite.conf
 Source2:       gitolite.rc
+Source3:       git.conf
+Source4:       gitweb.conf
 BuildRequires: rpmbuild(macros) >= 1.202
 Requires:      gitolite
 Provides:      group(gitolite)
@@ -37,9 +39,12 @@
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT/home/services/gitolite/.gitolite/conf
 cp -p %{SOURCE2} $RPM_BUILD_ROOT/home/services/gitolite/.gitolite.rc
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/home/services/gitolite/.gitconfig
 cp -a hooks/* $RPM_BUILD_ROOT/home/services/gitolite/.gitolite/hooks/common
 cp -a adc $RPM_BUILD_ROOT/home/services/gitolite/
 
+install -D %{SOURCE4} 
$RPM_BUILD_ROOT/%{_sysconfdir}/webapps/gitweb/gitweb-pld.conf
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -62,6 +67,7 @@
 
 %dir /home/services/gitolite
 %dir /home/services/gitolite/repositories
+%config(noreplace) %verify(not md5 mtime size) 
/home/services/gitolite/.gitconfig
 
 %dir /home/services/gitolite/.gitolite
 %config(noreplace) %verify(not md5 mtime size) 
/home/services/gitolite/.gitolite.rc
@@ -82,12 +88,18 @@
 %attr(744,gitolite,gitolite) /home/services/gitolite/adc/bin/create
 /home/services/gitolite/adc/bin/adc.common-functions
 
+%attr(644,root,root) %{_sysconfdir}/webapps/gitweb/gitweb-pld.conf
+
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <[email protected]>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2012/04/02 13:12:33  draenog
+- up to 0.4
+- config files for gitweb and mailing lists
+
 Revision 1.4  2012/04/01 07:47:02  draenog
 - up to 0.3
 

================================================================
Index: packages/pld-gitolite/git.conf
diff -u /dev/null packages/pld-gitolite/git.conf:1.1
--- /dev/null   Mon Apr  2 15:12:39 2012
+++ packages/pld-gitolite/git.conf      Mon Apr  2 15:12:33 2012
@@ -0,0 +1,9 @@
+[user]
+       name = gitolite
+[user]
+       email = [email protected]
+[hooks]
+       mailinglist = [email protected]
+       distfiles = [email protected]
+       showrev = "git show -C %s; echo"
+        emailprefix = ""

================================================================
Index: packages/pld-gitolite/gitweb.conf
diff -u /dev/null packages/pld-gitolite/gitweb.conf:1.1
--- /dev/null   Mon Apr  2 15:12:39 2012
+++ packages/pld-gitolite/gitweb.conf   Mon Apr  2 15:12:33 2012
@@ -0,0 +1,12 @@
+our $projectroot = "/home/services/gitolite/repositories";
+our $projects_list = "/home/services/gitolite/projects.list";
+our $projects_list_description_width = 50;
+our $no_list_age = 1;
+our $no_list_owner = 1;
+
+our $logo_url = "http://www.pld-linux.org";;
+our $logo_label="PLD Linux distribution";
+our $logo="http://www.pld-linux.org/htdocs/pldtheme/img/pld-logo.png";;
+our $favicon="http://www.pld-linux.org/favicon.ico";;
+
+$feature{'timed'}{'default'} = [1];
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/pld-gitolite/gitolite.conf?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/pld-gitolite/gitolite.rc?r1=1.1&r2=1.2
    
http://cvs.pld-linux.org/packages/pld-gitolite/pld-gitolite.spec?r1=1.4&r2=1.5

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to