* [gentoo-commits] proj/gitolite-gentoo:t/ssh-key-options commit in: /
@ 2011-03-25 20:00 Christian Ruppert
2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
0 siblings, 2 replies; 30+ messages in thread
From: Christian Ruppert @ 2011-03-25 20:00 UTC (permalink / raw
To: gentoo-commits
commit: 4a8b062276349bf54e4b4235ddd201b1f59bf820
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:33:24 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:33:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=4a8b0622
Merge branch 't/find_pubkeys-function' into refs/top-bases/t/ssh-key-options
README.mkd | 30 +-
conf/example.conf | 243 +---------
conf/example.gitolite.rc | 26 +-
contrib/adc/able | 20 +-
contrib/adc/adc.common-functions | 5 +
contrib/adc/fork | 9 +-
contrib/adc/get-rights-and-owner.in-perl | 15 +-
contrib/adc/git | 123 +++++
contrib/adc/gl-reflog | 8 +-
contrib/adc/hub | 443 +++++++++++++++++
contrib/adc/hub.mkd | 202 ++++++++
contrib/adc/perms | 115 +++++
contrib/adc/pygitolite.py | 77 +++
contrib/adc/rm | 4 +-
contrib/adc/set-head | 17 +
contrib/adc/who-pushed | 2 +-
contrib/autotoc | 35 --
contrib/gerrit.mkd | 2 +-
contrib/gitolite-tools.mkd | 2 +-
contrib/gitweb/gitweb.conf | 44 ++-
contrib/ldap/README.mkd | 6 +-
contrib/vim/README.mkd | 2 +-
doc/1-INSTALL.mkd | 53 ++-
doc/2-admin.mkd | 56 ++-
doc/3-faq-tips-etc.mkd | 285 ++----------
doc/CHANGELOG | 22 +
doc/admin-defined-commands.mkd | 14 +-
doc/big-config.mkd | 14 +-
doc/delegation.mkd | 10 +-
doc/developer-notes.mkd | 213 ++++++++
doc/gitolite.conf.mkd | 469 ++++++++++++++++++
doc/gitolite.rc.mkd | 62 ++-
doc/hook-propagation.mkd | 4 +-
doc/http-backend.mkd | 142 +++++--
doc/migrate.mkd | 10 +-
doc/mirroring.mkd | 21 +-
doc/mob-branches.mkd | 2 +-
doc/monkeysphere.mkd | 2 +
doc/overkill.mkd | 2 +-
doc/packaging.mkd | 2 +-
doc/progit-article.mkd | 14 +-
doc/report-output.mkd | 19 +
doc/shell-games.mkd | 25 +-
doc/ssh-troubleshooting.mkd | 42 ++-
doc/uninstall.mkd | 2 +-
doc/who-uses-it.mkd | 4 +-
doc/wildcard-repositories.mkd | 17 +-
hooks/common/gl-pre-git.hub-sample | 10 +
hooks/common/update | 62 +--
hooks/gitolite-admin/post-update | 8 +-
src/gitolite.pm | 775 +++++++++++++++---------------
src/gitolite_env.pm | 157 ++++++
src/gitolite_rc.pm | 70 +++
src/gl-auth-command | 235 +++------
src/gl-compile-conf | 141 ++----
src/gl-dont-panic | 17 +-
src/gl-easy-install | 16 +-
src/gl-install | 33 +-
src/gl-mirror-shell | 13 +-
src/gl-mirror-sync | 4 +-
src/gl-query-rc | 23 +
src/gl-setup | 47 ++-
src/gl-setup-authkeys | 64 ++--
src/gl-time | 30 +-
src/gl-tool | 9 +-
src/sshkeys-lint | 6 +-
t/README.mkd | 11 +-
t/t53-check-info-expand-output | 16 +
t/t64-write-able | 11 +-
t/t65-rsync | 83 ++++
t/t67-hub | 174 +++++++
t/test-driver.sh | 73 ++--
72 files changed, 3483 insertions(+), 1541 deletions(-)
^ permalink raw reply [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
2011-03-25 20:00 [gentoo-commits] proj/gitolite-gentoo:t/ssh-key-options commit in: / Christian Ruppert
@ 2011-03-25 19:59 ` Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
1 sibling, 0 replies; 30+ messages in thread
From: Christian Ruppert @ 2011-03-25 19:59 UTC (permalink / raw
To: gentoo-commits
commit: 4a8b062276349bf54e4b4235ddd201b1f59bf820
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:33:24 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:33:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=4a8b0622
Merge branch 't/find_pubkeys-function' into refs/top-bases/t/ssh-key-options
README.mkd | 30 +-
conf/example.conf | 243 +---------
conf/example.gitolite.rc | 26 +-
contrib/adc/able | 20 +-
contrib/adc/adc.common-functions | 5 +
contrib/adc/fork | 9 +-
contrib/adc/get-rights-and-owner.in-perl | 15 +-
contrib/adc/git | 123 +++++
contrib/adc/gl-reflog | 8 +-
contrib/adc/hub | 443 +++++++++++++++++
contrib/adc/hub.mkd | 202 ++++++++
contrib/adc/perms | 115 +++++
contrib/adc/pygitolite.py | 77 +++
contrib/adc/rm | 4 +-
contrib/adc/set-head | 17 +
contrib/adc/who-pushed | 2 +-
contrib/autotoc | 35 --
contrib/gerrit.mkd | 2 +-
contrib/gitolite-tools.mkd | 2 +-
contrib/gitweb/gitweb.conf | 44 ++-
contrib/ldap/README.mkd | 6 +-
contrib/vim/README.mkd | 2 +-
doc/1-INSTALL.mkd | 53 ++-
doc/2-admin.mkd | 56 ++-
doc/3-faq-tips-etc.mkd | 285 ++----------
doc/CHANGELOG | 22 +
doc/admin-defined-commands.mkd | 14 +-
doc/big-config.mkd | 14 +-
doc/delegation.mkd | 10 +-
doc/developer-notes.mkd | 213 ++++++++
doc/gitolite.conf.mkd | 469 ++++++++++++++++++
doc/gitolite.rc.mkd | 62 ++-
doc/hook-propagation.mkd | 4 +-
doc/http-backend.mkd | 142 +++++--
doc/migrate.mkd | 10 +-
doc/mirroring.mkd | 21 +-
doc/mob-branches.mkd | 2 +-
doc/monkeysphere.mkd | 2 +
doc/overkill.mkd | 2 +-
doc/packaging.mkd | 2 +-
doc/progit-article.mkd | 14 +-
doc/report-output.mkd | 19 +
doc/shell-games.mkd | 25 +-
doc/ssh-troubleshooting.mkd | 42 ++-
doc/uninstall.mkd | 2 +-
doc/who-uses-it.mkd | 4 +-
doc/wildcard-repositories.mkd | 17 +-
hooks/common/gl-pre-git.hub-sample | 10 +
hooks/common/update | 62 +--
hooks/gitolite-admin/post-update | 8 +-
src/gitolite.pm | 775 +++++++++++++++---------------
src/gitolite_env.pm | 157 ++++++
src/gitolite_rc.pm | 70 +++
src/gl-auth-command | 235 +++------
src/gl-compile-conf | 141 ++----
src/gl-dont-panic | 17 +-
src/gl-easy-install | 16 +-
src/gl-install | 33 +-
src/gl-mirror-shell | 13 +-
src/gl-mirror-sync | 4 +-
src/gl-query-rc | 23 +
src/gl-setup | 47 ++-
src/gl-setup-authkeys | 64 ++--
src/gl-time | 30 +-
src/gl-tool | 9 +-
src/sshkeys-lint | 6 +-
t/README.mkd | 11 +-
t/t53-check-info-expand-output | 16 +
t/t64-write-able | 11 +-
t/t65-rsync | 83 ++++
t/t67-hub | 174 +++++++
t/test-driver.sh | 73 ++--
72 files changed, 3483 insertions(+), 1541 deletions(-)
^ permalink raw reply [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
2011-03-25 20:00 [gentoo-commits] proj/gitolite-gentoo:t/ssh-key-options commit in: / Christian Ruppert
2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
@ 2011-03-25 20:00 ` Christian Ruppert
1 sibling, 0 replies; 30+ messages in thread
From: Christian Ruppert @ 2011-03-25 20:00 UTC (permalink / raw
To: gentoo-commits
commit: 4a8b062276349bf54e4b4235ddd201b1f59bf820
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:33:24 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:33:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=4a8b0622
Merge branch 't/find_pubkeys-function' into refs/top-bases/t/ssh-key-options
README.mkd | 30 +-
conf/example.conf | 243 +---------
conf/example.gitolite.rc | 26 +-
contrib/adc/able | 20 +-
contrib/adc/adc.common-functions | 5 +
contrib/adc/fork | 9 +-
contrib/adc/get-rights-and-owner.in-perl | 15 +-
contrib/adc/git | 123 +++++
contrib/adc/gl-reflog | 8 +-
contrib/adc/hub | 443 +++++++++++++++++
contrib/adc/hub.mkd | 202 ++++++++
contrib/adc/perms | 115 +++++
contrib/adc/pygitolite.py | 77 +++
contrib/adc/rm | 4 +-
contrib/adc/set-head | 17 +
contrib/adc/who-pushed | 2 +-
contrib/autotoc | 35 --
contrib/gerrit.mkd | 2 +-
contrib/gitolite-tools.mkd | 2 +-
contrib/gitweb/gitweb.conf | 44 ++-
contrib/ldap/README.mkd | 6 +-
contrib/vim/README.mkd | 2 +-
doc/1-INSTALL.mkd | 53 ++-
doc/2-admin.mkd | 56 ++-
doc/3-faq-tips-etc.mkd | 285 ++----------
doc/CHANGELOG | 22 +
doc/admin-defined-commands.mkd | 14 +-
doc/big-config.mkd | 14 +-
doc/delegation.mkd | 10 +-
doc/developer-notes.mkd | 213 ++++++++
doc/gitolite.conf.mkd | 469 ++++++++++++++++++
doc/gitolite.rc.mkd | 62 ++-
doc/hook-propagation.mkd | 4 +-
doc/http-backend.mkd | 142 +++++--
doc/migrate.mkd | 10 +-
doc/mirroring.mkd | 21 +-
doc/mob-branches.mkd | 2 +-
doc/monkeysphere.mkd | 2 +
doc/overkill.mkd | 2 +-
doc/packaging.mkd | 2 +-
doc/progit-article.mkd | 14 +-
doc/report-output.mkd | 19 +
doc/shell-games.mkd | 25 +-
doc/ssh-troubleshooting.mkd | 42 ++-
doc/uninstall.mkd | 2 +-
doc/who-uses-it.mkd | 4 +-
doc/wildcard-repositories.mkd | 17 +-
hooks/common/gl-pre-git.hub-sample | 10 +
hooks/common/update | 62 +--
hooks/gitolite-admin/post-update | 8 +-
src/gitolite.pm | 775 +++++++++++++++---------------
src/gitolite_env.pm | 157 ++++++
src/gitolite_rc.pm | 70 +++
src/gl-auth-command | 235 +++------
src/gl-compile-conf | 141 ++----
src/gl-dont-panic | 17 +-
src/gl-easy-install | 16 +-
src/gl-install | 33 +-
src/gl-mirror-shell | 13 +-
src/gl-mirror-sync | 4 +-
src/gl-query-rc | 23 +
src/gl-setup | 47 ++-
src/gl-setup-authkeys | 64 ++--
src/gl-time | 30 +-
src/gl-tool | 9 +-
src/sshkeys-lint | 6 +-
t/README.mkd | 11 +-
t/t53-check-info-expand-output | 16 +
t/t64-write-able | 11 +-
t/t65-rsync | 83 ++++
t/t67-hub | 174 +++++++
t/test-driver.sh | 73 ++--
72 files changed, 3483 insertions(+), 1541 deletions(-)
^ permalink raw reply [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
@ 2011-03-28 15:19 Christian Ruppert
0 siblings, 0 replies; 30+ messages in thread
From: Christian Ruppert @ 2011-03-28 15:19 UTC (permalink / raw
To: gentoo-commits
commit: aa34db8f71db0a9336cfcdc5819dda694dd0e073
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 23:02:41 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 23:02:41 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=aa34db8f
Merge commit 'refs/top-bases/t/export-key-metadata' into t/export-key-metadata
src/gitolite.pm | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
^ permalink raw reply [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
@ 2011-03-28 15:19 Christian Ruppert
0 siblings, 0 replies; 30+ messages in thread
From: Christian Ruppert @ 2011-03-28 15:19 UTC (permalink / raw
To: gentoo-commits
commit: 029c007e9bc26ffcbde95ddb196f5c1a107ebe49
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 23:02:41 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 23:02:41 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=029c007e
Merge branch 't/export_key_metadata-function' into refs/top-bases/t/export-key-metadata
src/gitolite.pm | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
^ permalink raw reply [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/ssh-key-options commit in: /
@ 2011-03-25 20:00 Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
0 siblings, 1 reply; 30+ messages in thread
From: Christian Ruppert @ 2011-03-25 20:00 UTC (permalink / raw
To: gentoo-commits
commit: 80d28e6fb02556d600cd48a92b6486c514f8c722
Author: Sitaram Chamarty <sitaram <AT> atc <DOT> tcs <DOT> com>
AuthorDate: Sat Mar 5 11:59:20 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Sat Mar 5 11:59:20 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=80d28e6f
Merge branch 'dmitrijsledkovs/pu' into pu
doc/gitolite.conf.mkd | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
^ permalink raw reply [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
@ 2011-03-25 20:00 Christian Ruppert
0 siblings, 0 replies; 30+ messages in thread
From: Christian Ruppert @ 2011-03-25 20:00 UTC (permalink / raw
To: gentoo-commits
commit: 1687bc8af04a0e0e602aa902bd2c234d680e4143
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:52:33 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:52:33 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=1687bc8a
Merge commit 'refs/top-bases/t/export-key-metadata' into t/export-key-metadata
README.mkd | 30 +-
conf/example.conf | 243 +---------
conf/example.gitolite.rc | 26 +-
contrib/adc/able | 20 +-
contrib/adc/adc.common-functions | 5 +
contrib/adc/fork | 9 +-
contrib/adc/get-rights-and-owner.in-perl | 15 +-
contrib/adc/git | 123 +++++
contrib/adc/gl-reflog | 8 +-
contrib/adc/hub | 443 +++++++++++++++++
contrib/adc/hub.mkd | 202 ++++++++
contrib/adc/perms | 115 +++++
contrib/adc/pygitolite.py | 77 +++
contrib/adc/rm | 4 +-
contrib/adc/set-head | 17 +
contrib/adc/who-pushed | 2 +-
contrib/autotoc | 35 --
contrib/gerrit.mkd | 2 +-
contrib/gitolite-tools.mkd | 2 +-
contrib/gitweb/gitweb.conf | 44 ++-
contrib/ldap/README.mkd | 6 +-
contrib/vim/README.mkd | 2 +-
doc/1-INSTALL.mkd | 53 ++-
doc/2-admin.mkd | 56 ++-
doc/3-faq-tips-etc.mkd | 285 ++----------
doc/CHANGELOG | 22 +
doc/admin-defined-commands.mkd | 14 +-
doc/big-config.mkd | 14 +-
doc/delegation.mkd | 10 +-
doc/developer-notes.mkd | 213 ++++++++
doc/gitolite.conf.mkd | 469 ++++++++++++++++++
doc/gitolite.rc.mkd | 62 ++-
doc/hook-propagation.mkd | 4 +-
doc/http-backend.mkd | 142 +++++--
doc/migrate.mkd | 10 +-
doc/mirroring.mkd | 21 +-
doc/mob-branches.mkd | 2 +-
doc/monkeysphere.mkd | 2 +
doc/overkill.mkd | 2 +-
doc/packaging.mkd | 2 +-
doc/progit-article.mkd | 14 +-
doc/report-output.mkd | 19 +
doc/shell-games.mkd | 25 +-
doc/ssh-troubleshooting.mkd | 42 ++-
doc/uninstall.mkd | 2 +-
doc/who-uses-it.mkd | 4 +-
doc/wildcard-repositories.mkd | 17 +-
hooks/common/gl-pre-git.hub-sample | 10 +
hooks/common/update | 62 +--
hooks/gitolite-admin/post-update | 8 +-
src/gitolite.pm | 776 +++++++++++++++---------------
src/gitolite_env.pm | 157 ++++++
src/gitolite_rc.pm | 72 +++
src/gl-auth-command | 235 +++------
src/gl-compile-conf | 141 ++----
src/gl-dont-panic | 17 +-
src/gl-easy-install | 16 +-
src/gl-install | 33 +-
src/gl-mirror-shell | 13 +-
src/gl-mirror-sync | 4 +-
src/gl-query-rc | 23 +
src/gl-setup | 47 ++-
src/gl-setup-authkeys | 64 ++--
src/gl-time | 30 +-
src/gl-tool | 9 +-
src/sshkeys-lint | 6 +-
t/README.mkd | 11 +-
t/t53-check-info-expand-output | 16 +
t/t64-write-able | 11 +-
t/t65-rsync | 83 ++++
t/t67-hub | 174 +++++++
t/test-driver.sh | 73 ++--
72 files changed, 3485 insertions(+), 1542 deletions(-)
diff --cc conf/example.gitolite.rc
index 6f57994,d800357..6b73f34
--- a/conf/example.gitolite.rc
+++ b/conf/example.gitolite.rc
@@@ -31,18 -34,12 +34,20 @@@ $REPO_UMASK = 0077
# ------------------------------------------------------------------------------
$GL_BIG_CONFIG = 0;
$GL_NO_DAEMON_NO_GITWEB = 0;
+ # $GL_NICE_VALUE = 0;
+# Define which metadata variables shall be exported to the gitolite environment.
+# Those variables can be used in hooks, e.g. for cia.vc
+# A pubkey file might contain one or more of those variable.
+# They can be defined by e.g:"# git-username: idl0r"
+# Each '-' (dash) will be replaced by an '_' (underscore).
+#@GL_METADATA = ( "git-username", "git-email", "git-realname", "git-realname-ascii", "cia-vc-username" );
+#@GL_METADATA_REQUIRED = ( "git-username", "git-email", "git-realname" );
+
# ------------------------------------------------------------------------------
- # VARIABLES WITH A SECURITY IMPACT. READ DOC WELL BEFORE CHANGING THESE.
+ # VARIABLES WITH A SECURITY IMPACT. READ DOCS BEFORE CHANGING THESE!
# http://github.com/sitaramc/gitolite/blob/pu/doc/gitolite.rc.mkd#_variables_with_a_security_impact
+ # (or http://sitaramc.github.com/gitolite/doc/gitolite.rc.html#_variables_with_a_security_impact)
# ------------------------------------------------------------------------------
# $GL_ALL_READ_ALL = 0;
$GIT_PATH="";
diff --cc src/gitolite_rc.pm
index 0000000,132fc90..3ae0224
mode 000000,100644..100644
--- a/src/gitolite_rc.pm
+++ b/src/gitolite_rc.pm
@@@ -1,0 -1,72 +1,72 @@@
+ # stuff to help pull in the rc file, plus various constants
+
+ package gitolite_rc;
+ use Exporter 'import';
+
+ # the first set (before the blank line) are constants defined right here in
+ # this program. The second set are from the 'rc'; We're clubbing all in
+ # because they're all "constants" in a programmatic sense
+ @EXPORT = qw(
+ $ABRT $WARN
+ $R_COMMANDS $W_COMMANDS
+ $REPONAME_PATT $USERNAME_PATT $REPOPATT_PATT
+ $ADC_CMD_ARGS_PATT
+ $current_data_version
+
+ $ADMIN_POST_UPDATE_CHAINS_TO $ENV $GITOLITE_BASE $GITOLITE_PATH $GIT_PATH
+ $GL_ADC_PATH $GL_ADMINDIR $GL_ALL_INCLUDES_SPECIAL $GL_ALL_READ_ALL
+ $GL_BIG_CONFIG $GL_CONF $GL_CONF_COMPILED $GL_GET_MEMBERSHIPS_PGM
+ $GL_GITCONFIG_KEYS $GL_GITCONFIG_WILD $GL_KEYDIR $GL_LOGT $GL_NICE_VALUE
+ $GL_NO_CREATE_REPOS $GL_NO_DAEMON_NO_GITWEB $GL_NO_SETUP_AUTHKEYS
+ $GL_PACKAGE_CONF $GL_PACKAGE_HOOKS $GL_PERFLOGT $GL_SITE_INFO
+ $GL_SLAVE_MODE $GL_WILDREPOS $GL_WILDREPOS_DEFPERMS
+ $GL_WILDREPOS_PERM_CATS $HTPASSWD_FILE $PROJECTS_LIST $REPO_BASE
+ $REPO_UMASK $RSYNC_BASE $SVNSERVE $UPDATE_CHAINS_TO
+
+ $GL_HTTP_ANON_USER
+
- @GL_METADATA
++ @GL_METADATA @GL_METADATA_REQUIRED
+ );
+
+ # ------------------------------------------------------------------------------
+ # real constants
+ # ------------------------------------------------------------------------------
+
+ $current_data_version = '1.7';
+
+ $ABRT = "\n\t\t***** ABORTING *****\n ";
+ $WARN = "\n\t\t***** WARNING *****\n ";
+
+ # commands we're expecting
+ $R_COMMANDS=qr/^(git[ -]upload-pack|git[ -]upload-archive)$/;
+ $W_COMMANDS=qr/^git[ -]receive-pack$/;
+
+ # note that REPONAME_PATT allows "/", while USERNAME_PATT does not
+ # also, the reason REPONAME_PATT is a superset of USERNAME_PATT is (duh!)
+ # because a repo can have "CREATOR" in the name
+ $REPONAME_PATT=qr(^\@?[0-9a-zA-Z][0-9a-zA-Z._\@/+-]*$);
+ $USERNAME_PATT=qr(^\@?[0-9a-zA-Z][0-9a-zA-Z._\@+-]*$);
+ # same as REPONAME, but used for wildcard repos, allows some common regex metas
+ $REPOPATT_PATT=qr(^\@?[0-9a-zA-Z[][\\^.$|()[\]*+?{}0-9a-zA-Z._\@/-]*$);
+
+ # ADC commands and arguments must match this pattern
+ $ADC_CMD_ARGS_PATT=qr(^[0-9a-zA-Z._\@/+:-]*$);
+
+ # ------------------------------------------------------------------------------
+ # bring in the rc vars and allow querying them
+ # ------------------------------------------------------------------------------
+
+ # in case we're running under Apache using smart http
+ $ENV{HOME} = $ENV{GITOLITE_HTTP_HOME} if $ENV{GITOLITE_HTTP_HOME};
+
+ # we also need to "bring in" the rc variables. The rc can only be in one of
+ # these two places; the first one we find, wins
+ for ("$ENV{HOME}/.gitolite.rc", "/etc/gitolite/gitolite.rc") {
+ $ENV{GL_RC} ||= $_ if -f;
+ }
+ die "no rc file found\n" unless $ENV{GL_RC};
+ do $ENV{GL_RC} or die "error parsing $ENV{GL_RC}\n";
+
+ # ------------------------------------------------------------------------------
+ # per perl rules, this should be the last line in such a file:
+ 1;
diff --cc src/gl-auth-command
index bafa925,754bfad..3ad0302
--- a/src/gl-auth-command
+++ b/src/gl-auth-command
@@@ -260,18 -173,8 +173,18 @@@ if (-x "$ENV{GL_REPO_BASE_ABS}/$repo.gi
# over to git now
# ----------------------------------------------------------------------------
+my $metaenv = "Metadata ENV:";
+export_key_metadata($user);
+foreach my $metadata (@GL_METADATA) {
+ $metadata =~ s/-/_/g;
+ if(defined($ENV{$metadata})) {
+ $metaenv = join(" ", $metaenv, "${metadata}=\"$ENV{$metadata}\"");
+ }
+}
+log_it("${metaenv}\n");
+
if ($ENV{REQUEST_URI}) {
- &log_it($ENV{REQUEST_URI});
+ log_it($ENV{REQUEST_URI});
exec $ENV{GIT_HTTP_BACKEND};
# the GIT_HTTP_BACKEND env var should be set either by the rc file, or as
# a SetEnv in the apache config somewhere
^ permalink raw reply [flat|nested] 30+ messages in thread* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
@ 2011-03-25 20:00 Christian Ruppert
0 siblings, 0 replies; 30+ messages in thread
From: Christian Ruppert @ 2011-03-25 20:00 UTC (permalink / raw
To: gentoo-commits
commit: 58a9e8581b9f34610ad086792af33fb859264c46
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:47:31 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:47:31 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=58a9e858
Merge branch 't/export_key_metadata-function' into refs/top-bases/t/export-key-metadata
README.mkd | 30 +-
conf/example.conf | 243 +---------
conf/example.gitolite.rc | 26 +-
contrib/adc/able | 20 +-
contrib/adc/adc.common-functions | 5 +
contrib/adc/fork | 9 +-
contrib/adc/get-rights-and-owner.in-perl | 15 +-
contrib/adc/git | 123 +++++
contrib/adc/gl-reflog | 8 +-
contrib/adc/hub | 443 +++++++++++++++++
contrib/adc/hub.mkd | 202 ++++++++
contrib/adc/perms | 115 +++++
contrib/adc/pygitolite.py | 77 +++
contrib/adc/rm | 4 +-
contrib/adc/set-head | 17 +
contrib/adc/who-pushed | 2 +-
contrib/autotoc | 35 --
contrib/gerrit.mkd | 2 +-
contrib/gitolite-tools.mkd | 2 +-
contrib/gitweb/gitweb.conf | 44 ++-
contrib/ldap/README.mkd | 6 +-
contrib/vim/README.mkd | 2 +-
doc/1-INSTALL.mkd | 53 ++-
doc/2-admin.mkd | 56 ++-
doc/3-faq-tips-etc.mkd | 285 ++----------
doc/CHANGELOG | 22 +
doc/admin-defined-commands.mkd | 14 +-
doc/big-config.mkd | 14 +-
doc/delegation.mkd | 10 +-
doc/developer-notes.mkd | 213 ++++++++
doc/gitolite.conf.mkd | 469 ++++++++++++++++++
doc/gitolite.rc.mkd | 62 ++-
doc/hook-propagation.mkd | 4 +-
doc/http-backend.mkd | 142 +++++--
doc/migrate.mkd | 10 +-
doc/mirroring.mkd | 21 +-
doc/mob-branches.mkd | 2 +-
doc/monkeysphere.mkd | 2 +
doc/overkill.mkd | 2 +-
doc/packaging.mkd | 2 +-
doc/progit-article.mkd | 14 +-
doc/report-output.mkd | 19 +
doc/shell-games.mkd | 25 +-
doc/ssh-troubleshooting.mkd | 42 ++-
doc/uninstall.mkd | 2 +-
doc/who-uses-it.mkd | 4 +-
doc/wildcard-repositories.mkd | 17 +-
hooks/common/gl-pre-git.hub-sample | 10 +
hooks/common/update | 62 +--
hooks/gitolite-admin/post-update | 8 +-
src/gitolite.pm | 776 +++++++++++++++---------------
src/gitolite_env.pm | 157 ++++++
src/gitolite_rc.pm | 72 +++
src/gl-auth-command | 235 +++------
src/gl-compile-conf | 141 ++----
src/gl-dont-panic | 17 +-
src/gl-easy-install | 16 +-
src/gl-install | 33 +-
src/gl-mirror-shell | 13 +-
src/gl-mirror-sync | 4 +-
src/gl-query-rc | 23 +
src/gl-setup | 47 ++-
src/gl-setup-authkeys | 64 ++--
src/gl-time | 30 +-
src/gl-tool | 9 +-
src/sshkeys-lint | 6 +-
t/README.mkd | 11 +-
t/t53-check-info-expand-output | 16 +
t/t64-write-able | 11 +-
t/t65-rsync | 83 ++++
t/t67-hub | 174 +++++++
t/test-driver.sh | 73 ++--
72 files changed, 3485 insertions(+), 1542 deletions(-)
diff --cc src/gitolite.pm
index 64bab29,f32bcf0..af4350a
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -6,44 -41,22 +41,24 @@@ use Data::Dumper
$Data::Dumper::Deepcopy = 1;
$|++;
- # this file is commonly used using "require". It is not required to use "use"
- # (because it doesn't live in a different package)
++use Net::SSH::AuthorizedKeysFile; # To parse the pubkeyfile with options etc.
+
- # warning: preceding para requires 4th attribute of a programmer after
- # laziness, impatience, and hubris: sense of humour :-)
+ # ----------------------------------------------------------------------------
+ # find the rc file, then pull the libraries
+ # ----------------------------------------------------------------------------
- # WARNING
- # -------
- # the name of this file will change as soon as its function/feature set
- # stabilises enough ;-)
+ BEGIN {
+ die "ENV GL_RC not set\n" unless $ENV{GL_RC};
+ die "ENV GL_BINDIR not set\n" unless $ENV{GL_BINDIR};
+ }
- # right now all it does is
- # - define a function that tells you where to find the rc file
- # - define a function that creates a new repo and give it our update hook
+ use lib $ENV{GL_BINDIR};
+ use gitolite_rc;
# ----------------------------------------------------------------------------
- # common definitions
+ # the big data structures we care about
# ----------------------------------------------------------------------------
- our $ABRT = "\n\t\t***** ABORTING *****\n ";
- our $WARN = "\n\t\t***** WARNING *****\n ";
-
- # commands we're expecting
- our $R_COMMANDS=qr/^(git[ -]upload-pack|git[ -]upload-archive)$/;
- our $W_COMMANDS=qr/^git[ -]receive-pack$/;
-
- # note that REPONAME_PATT allows "/", while USERNAME_PATT does not
- # also, the reason REPONAME_PATT is a superset of USERNAME_PATT is (duh!)
- # because in this version, a repo can have "CREATOR" in the name (see docs)
- our $REPONAME_PATT=qr(^\@?[0-9a-zA-Z][0-9a-zA-Z._\@/+-]*$); # very simple pattern
- our $USERNAME_PATT=qr(^\@?[0-9a-zA-Z][0-9a-zA-Z._\@+-]*$); # very simple pattern
- # same as REPONAME, but used for wildcard repos, allows some common regex metas
- our $REPOPATT_PATT=qr(^\@?[0-9a-zA-Z[][\\^.$|()[\]*+?{}0-9a-zA-Z._\@/-]*$);
- # ADC commands and arguments must match this pattern
- our $ADC_CMD_ARGS_PATT=qr(^[0-9a-zA-Z._\@/+:-]*$);
-
- # these come from the RC file
- our ($REPO_UMASK, $GL_WILDREPOS, $GL_PACKAGE_CONF, $GL_PACKAGE_HOOKS, $REPO_BASE, $GL_CONF_COMPILED, $GL_BIG_CONFIG, $GL_PERFLOGT, $PROJECTS_LIST, $GL_ALL_INCLUDES_SPECIAL, $GL_SITE_INFO, $GL_GET_MEMBERSHIPS_PGM, $GL_WILDREPOS_PERM_CATS, $GL_KEYDIR, @GL_METADATA);
our %repos;
our %groups;
our %git_configs;
@@@ -828,18 -875,12 +877,18 @@@ sub setup_authkey
# may not be passed; so make sure it's a valid hashref, even if empty
$user_list_p = {} unless $user_list_p;
- # CONSTANTS
+ # LOCAL CONSTANTS
# command and options for authorized_keys
+ my @AUTH_OPTIONS_PRESERVE = ( "from" );
+ my %AUTH_OPTIONS = (
+ "no-port-forwarding" => 1,
+ "no-X11-forwarding" => 1,
+ "no-agent-forwarding" => 1,
+ "no-pty" => 1,
+ );
- my $AUTH_COMMAND="$bindir/gl-auth-command";
- $AUTH_COMMAND="$bindir/gl-time $bindir/gl-auth-command" if $GL_PERFLOGT;
+ my $AUTH_COMMAND="$ENV{GL_BINDIR}/gl-auth-command";
+ $AUTH_COMMAND="$ENV{GL_BINDIR}/gl-time $ENV{GL_BINDIR}/gl-auth-command" if $GL_PERFLOGT;
- my $AUTH_OPTIONS="no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty";
# START
^ permalink raw reply [flat|nested] 30+ messages in thread* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-03-25 19:59 Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
0 siblings, 1 reply; 30+ messages in thread
From: Christian Ruppert @ 2011-03-25 19:59 UTC (permalink / raw
To: gentoo-commits
commit: 09d925858a778b14e4e364613c2c37d8e903d063
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:47:37 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:47:37 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=09d92585
Merge branch 't/ssh-key-options' into refs/top-bases/t/export-key-metadata
^ permalink raw reply [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-03-25 19:59 Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
0 siblings, 1 reply; 30+ messages in thread
From: Christian Ruppert @ 2011-03-25 19:59 UTC (permalink / raw
To: gentoo-commits
commit: 85234f9f587c08c8e3ef8fda90ee05a29bdbc194
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:23:25 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:23:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=85234f9f
Merge branch 't/find_pubkeys-function' into refs/top-bases/t/export_key_metadata-function
README.mkd | 30 +-
conf/example.conf | 243 +---------
conf/example.gitolite.rc | 26 +-
contrib/adc/able | 20 +-
contrib/adc/adc.common-functions | 5 +
contrib/adc/fork | 9 +-
contrib/adc/get-rights-and-owner.in-perl | 15 +-
contrib/adc/git | 123 +++++
contrib/adc/gl-reflog | 8 +-
contrib/adc/hub | 443 +++++++++++++++++
contrib/adc/hub.mkd | 202 ++++++++
contrib/adc/perms | 115 +++++
contrib/adc/pygitolite.py | 77 +++
contrib/adc/rm | 4 +-
contrib/adc/set-head | 17 +
contrib/adc/who-pushed | 2 +-
contrib/autotoc | 35 --
contrib/gerrit.mkd | 2 +-
contrib/gitolite-tools.mkd | 2 +-
contrib/gitweb/gitweb.conf | 44 ++-
contrib/ldap/README.mkd | 6 +-
contrib/vim/README.mkd | 2 +-
doc/1-INSTALL.mkd | 53 ++-
doc/2-admin.mkd | 56 ++-
doc/3-faq-tips-etc.mkd | 285 ++----------
doc/CHANGELOG | 22 +
doc/admin-defined-commands.mkd | 14 +-
doc/big-config.mkd | 14 +-
doc/delegation.mkd | 10 +-
doc/developer-notes.mkd | 213 ++++++++
doc/gitolite.conf.mkd | 469 ++++++++++++++++++
doc/gitolite.rc.mkd | 62 ++-
doc/hook-propagation.mkd | 4 +-
doc/http-backend.mkd | 142 +++++--
doc/migrate.mkd | 10 +-
doc/mirroring.mkd | 21 +-
doc/mob-branches.mkd | 2 +-
doc/monkeysphere.mkd | 2 +
doc/overkill.mkd | 2 +-
doc/packaging.mkd | 2 +-
doc/progit-article.mkd | 14 +-
doc/report-output.mkd | 19 +
doc/shell-games.mkd | 25 +-
doc/ssh-troubleshooting.mkd | 42 ++-
doc/uninstall.mkd | 2 +-
doc/who-uses-it.mkd | 4 +-
doc/wildcard-repositories.mkd | 17 +-
hooks/common/gl-pre-git.hub-sample | 10 +
hooks/common/update | 62 +--
hooks/gitolite-admin/post-update | 8 +-
src/gitolite.pm | 775 +++++++++++++++---------------
src/gitolite_env.pm | 157 ++++++
src/gitolite_rc.pm | 70 +++
src/gl-auth-command | 235 +++------
src/gl-compile-conf | 141 ++----
src/gl-dont-panic | 17 +-
src/gl-easy-install | 16 +-
src/gl-install | 33 +-
src/gl-mirror-shell | 13 +-
src/gl-mirror-sync | 4 +-
src/gl-query-rc | 23 +
src/gl-setup | 47 ++-
src/gl-setup-authkeys | 64 ++--
src/gl-time | 30 +-
src/gl-tool | 9 +-
src/sshkeys-lint | 6 +-
t/README.mkd | 11 +-
t/t53-check-info-expand-output | 16 +
t/t64-write-able | 11 +-
t/t65-rsync | 83 ++++
t/t67-hub | 174 +++++++
t/test-driver.sh | 73 ++--
72 files changed, 3483 insertions(+), 1541 deletions(-)
^ permalink raw reply [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
2011-03-25 19:59 [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
@ 2011-03-25 20:00 ` Christian Ruppert
0 siblings, 0 replies; 30+ messages in thread
From: Christian Ruppert @ 2011-03-25 20:00 UTC (permalink / raw
To: gentoo-commits
commit: 85234f9f587c08c8e3ef8fda90ee05a29bdbc194
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:23:25 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:23:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=85234f9f
Merge branch 't/find_pubkeys-function' into refs/top-bases/t/export_key_metadata-function
README.mkd | 30 +-
conf/example.conf | 243 +---------
conf/example.gitolite.rc | 26 +-
contrib/adc/able | 20 +-
contrib/adc/adc.common-functions | 5 +
contrib/adc/fork | 9 +-
contrib/adc/get-rights-and-owner.in-perl | 15 +-
contrib/adc/git | 123 +++++
contrib/adc/gl-reflog | 8 +-
contrib/adc/hub | 443 +++++++++++++++++
contrib/adc/hub.mkd | 202 ++++++++
contrib/adc/perms | 115 +++++
contrib/adc/pygitolite.py | 77 +++
contrib/adc/rm | 4 +-
contrib/adc/set-head | 17 +
contrib/adc/who-pushed | 2 +-
contrib/autotoc | 35 --
contrib/gerrit.mkd | 2 +-
contrib/gitolite-tools.mkd | 2 +-
contrib/gitweb/gitweb.conf | 44 ++-
contrib/ldap/README.mkd | 6 +-
contrib/vim/README.mkd | 2 +-
doc/1-INSTALL.mkd | 53 ++-
doc/2-admin.mkd | 56 ++-
doc/3-faq-tips-etc.mkd | 285 ++----------
doc/CHANGELOG | 22 +
doc/admin-defined-commands.mkd | 14 +-
doc/big-config.mkd | 14 +-
doc/delegation.mkd | 10 +-
doc/developer-notes.mkd | 213 ++++++++
doc/gitolite.conf.mkd | 469 ++++++++++++++++++
doc/gitolite.rc.mkd | 62 ++-
doc/hook-propagation.mkd | 4 +-
doc/http-backend.mkd | 142 +++++--
doc/migrate.mkd | 10 +-
doc/mirroring.mkd | 21 +-
doc/mob-branches.mkd | 2 +-
doc/monkeysphere.mkd | 2 +
doc/overkill.mkd | 2 +-
doc/packaging.mkd | 2 +-
doc/progit-article.mkd | 14 +-
doc/report-output.mkd | 19 +
doc/shell-games.mkd | 25 +-
doc/ssh-troubleshooting.mkd | 42 ++-
doc/uninstall.mkd | 2 +-
doc/who-uses-it.mkd | 4 +-
doc/wildcard-repositories.mkd | 17 +-
hooks/common/gl-pre-git.hub-sample | 10 +
hooks/common/update | 62 +--
hooks/gitolite-admin/post-update | 8 +-
src/gitolite.pm | 775 +++++++++++++++---------------
src/gitolite_env.pm | 157 ++++++
src/gitolite_rc.pm | 70 +++
src/gl-auth-command | 235 +++------
src/gl-compile-conf | 141 ++----
src/gl-dont-panic | 17 +-
src/gl-easy-install | 16 +-
src/gl-install | 33 +-
src/gl-mirror-shell | 13 +-
src/gl-mirror-sync | 4 +-
src/gl-query-rc | 23 +
src/gl-setup | 47 ++-
src/gl-setup-authkeys | 64 ++--
src/gl-time | 30 +-
src/gl-tool | 9 +-
src/sshkeys-lint | 6 +-
t/README.mkd | 11 +-
t/t53-check-info-expand-output | 16 +
t/t64-write-able | 11 +-
t/t65-rsync | 83 ++++
t/t67-hub | 174 +++++++
t/test-driver.sh | 73 ++--
72 files changed, 3483 insertions(+), 1541 deletions(-)
^ permalink raw reply [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-03-25 19:59 Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
0 siblings, 1 reply; 30+ messages in thread
From: Christian Ruppert @ 2011-03-25 19:59 UTC (permalink / raw
To: gentoo-commits
commit: b1ab3f43f2f26dda61b51b76a3e7ecbdc729cc89
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:41:33 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:41:33 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=b1ab3f43
Merge commit 'refs/top-bases/t/ssh-key-options' into t/ssh-key-options
README.mkd | 30 +-
conf/example.conf | 243 +---------
conf/example.gitolite.rc | 26 +-
contrib/adc/able | 20 +-
contrib/adc/adc.common-functions | 5 +
contrib/adc/fork | 9 +-
contrib/adc/get-rights-and-owner.in-perl | 15 +-
contrib/adc/git | 123 +++++
contrib/adc/gl-reflog | 8 +-
contrib/adc/hub | 443 +++++++++++++++++
contrib/adc/hub.mkd | 202 ++++++++
contrib/adc/perms | 115 +++++
contrib/adc/pygitolite.py | 77 +++
contrib/adc/rm | 4 +-
contrib/adc/set-head | 17 +
contrib/adc/who-pushed | 2 +-
contrib/autotoc | 35 --
contrib/gerrit.mkd | 2 +-
contrib/gitolite-tools.mkd | 2 +-
contrib/gitweb/gitweb.conf | 44 ++-
contrib/ldap/README.mkd | 6 +-
contrib/vim/README.mkd | 2 +-
doc/1-INSTALL.mkd | 53 ++-
doc/2-admin.mkd | 56 ++-
doc/3-faq-tips-etc.mkd | 285 ++----------
doc/CHANGELOG | 22 +
doc/admin-defined-commands.mkd | 14 +-
doc/big-config.mkd | 14 +-
doc/delegation.mkd | 10 +-
doc/developer-notes.mkd | 213 ++++++++
doc/gitolite.conf.mkd | 469 ++++++++++++++++++
doc/gitolite.rc.mkd | 62 ++-
doc/hook-propagation.mkd | 4 +-
doc/http-backend.mkd | 142 +++++--
doc/migrate.mkd | 10 +-
doc/mirroring.mkd | 21 +-
doc/mob-branches.mkd | 2 +-
doc/monkeysphere.mkd | 2 +
doc/overkill.mkd | 2 +-
doc/packaging.mkd | 2 +-
doc/progit-article.mkd | 14 +-
doc/report-output.mkd | 19 +
doc/shell-games.mkd | 25 +-
doc/ssh-troubleshooting.mkd | 42 ++-
doc/uninstall.mkd | 2 +-
doc/who-uses-it.mkd | 4 +-
doc/wildcard-repositories.mkd | 17 +-
hooks/common/gl-pre-git.hub-sample | 10 +
hooks/common/update | 62 +--
hooks/gitolite-admin/post-update | 8 +-
src/gitolite.pm | 776 +++++++++++++++---------------
src/gitolite_env.pm | 157 ++++++
src/gitolite_rc.pm | 70 +++
src/gl-auth-command | 235 +++------
src/gl-compile-conf | 141 ++----
src/gl-dont-panic | 17 +-
src/gl-easy-install | 16 +-
src/gl-install | 33 +-
src/gl-mirror-shell | 13 +-
src/gl-mirror-sync | 4 +-
src/gl-query-rc | 23 +
src/gl-setup | 47 ++-
src/gl-setup-authkeys | 64 ++--
src/gl-time | 30 +-
src/gl-tool | 9 +-
src/sshkeys-lint | 6 +-
t/README.mkd | 11 +-
t/t53-check-info-expand-output | 16 +
t/t64-write-able | 11 +-
t/t65-rsync | 83 ++++
t/t67-hub | 174 +++++++
t/test-driver.sh | 73 ++--
72 files changed, 3483 insertions(+), 1542 deletions(-)
diff --cc src/gitolite.pm
index 7b4bb31,a880037..5f594d2
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -6,44 -41,22 +41,24 @@@ use Data::Dumper
$Data::Dumper::Deepcopy = 1;
$|++;
- # this file is commonly used using "require". It is not required to use "use"
- # (because it doesn't live in a different package)
++use Net::SSH::AuthorizedKeysFile; # To parse the pubkeyfile with options etc.
+
- # warning: preceding para requires 4th attribute of a programmer after
- # laziness, impatience, and hubris: sense of humour :-)
+ # ----------------------------------------------------------------------------
+ # find the rc file, then pull the libraries
+ # ----------------------------------------------------------------------------
- # WARNING
- # -------
- # the name of this file will change as soon as its function/feature set
- # stabilises enough ;-)
+ BEGIN {
+ die "ENV GL_RC not set\n" unless $ENV{GL_RC};
+ die "ENV GL_BINDIR not set\n" unless $ENV{GL_BINDIR};
+ }
- # right now all it does is
- # - define a function that tells you where to find the rc file
- # - define a function that creates a new repo and give it our update hook
+ use lib $ENV{GL_BINDIR};
+ use gitolite_rc;
# ----------------------------------------------------------------------------
- # common definitions
+ # the big data structures we care about
# ----------------------------------------------------------------------------
- our $ABRT = "\n\t\t***** ABORTING *****\n ";
- our $WARN = "\n\t\t***** WARNING *****\n ";
-
- # commands we're expecting
- our $R_COMMANDS=qr/^(git[ -]upload-pack|git[ -]upload-archive)$/;
- our $W_COMMANDS=qr/^git[ -]receive-pack$/;
-
- # note that REPONAME_PATT allows "/", while USERNAME_PATT does not
- # also, the reason REPONAME_PATT is a superset of USERNAME_PATT is (duh!)
- # because in this version, a repo can have "CREATOR" in the name (see docs)
- our $REPONAME_PATT=qr(^\@?[0-9a-zA-Z][0-9a-zA-Z._\@/+-]*$); # very simple pattern
- our $USERNAME_PATT=qr(^\@?[0-9a-zA-Z][0-9a-zA-Z._\@+-]*$); # very simple pattern
- # same as REPONAME, but used for wildcard repos, allows some common regex metas
- our $REPOPATT_PATT=qr(^\@?[0-9a-zA-Z[][\\^.$|()[\]*+?{}0-9a-zA-Z._\@/-]*$);
- # ADC commands and arguments must match this pattern
- our $ADC_CMD_ARGS_PATT=qr(^[0-9a-zA-Z._\@/+:-]*$);
-
- # these come from the RC file
- our ($REPO_UMASK, $GL_WILDREPOS, $GL_PACKAGE_CONF, $GL_PACKAGE_HOOKS, $REPO_BASE, $GL_CONF_COMPILED, $GL_BIG_CONFIG, $GL_PERFLOGT, $PROJECTS_LIST, $GL_ALL_INCLUDES_SPECIAL, $GL_SITE_INFO, $GL_GET_MEMBERSHIPS_PGM, $GL_WILDREPOS_PERM_CATS);
our %repos;
our %groups;
our %git_configs;
@@@ -828,18 -875,12 +877,18 @@@ sub setup_authkey
# may not be passed; so make sure it's a valid hashref, even if empty
$user_list_p = {} unless $user_list_p;
- # CONSTANTS
+ # LOCAL CONSTANTS
# command and options for authorized_keys
+ my @AUTH_OPTIONS_PRESERVE = ( "from" );
+ my %AUTH_OPTIONS = (
+ "no-port-forwarding" => 1,
+ "no-X11-forwarding" => 1,
+ "no-agent-forwarding" => 1,
+ "no-pty" => 1,
+ );
- my $AUTH_COMMAND="$bindir/gl-auth-command";
- $AUTH_COMMAND="$bindir/gl-time $bindir/gl-auth-command" if $GL_PERFLOGT;
+ my $AUTH_COMMAND="$ENV{GL_BINDIR}/gl-auth-command";
+ $AUTH_COMMAND="$ENV{GL_BINDIR}/gl-time $ENV{GL_BINDIR}/gl-auth-command" if $GL_PERFLOGT;
- my $AUTH_OPTIONS="no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty";
# START
^ permalink raw reply [flat|nested] 30+ messages in thread* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
2011-03-25 19:59 [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
@ 2011-03-25 20:00 ` Christian Ruppert
0 siblings, 0 replies; 30+ messages in thread
From: Christian Ruppert @ 2011-03-25 20:00 UTC (permalink / raw
To: gentoo-commits
commit: b1ab3f43f2f26dda61b51b76a3e7ecbdc729cc89
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:41:33 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:41:33 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=b1ab3f43
Merge commit 'refs/top-bases/t/ssh-key-options' into t/ssh-key-options
README.mkd | 30 +-
conf/example.conf | 243 +---------
conf/example.gitolite.rc | 26 +-
contrib/adc/able | 20 +-
contrib/adc/adc.common-functions | 5 +
contrib/adc/fork | 9 +-
contrib/adc/get-rights-and-owner.in-perl | 15 +-
contrib/adc/git | 123 +++++
contrib/adc/gl-reflog | 8 +-
contrib/adc/hub | 443 +++++++++++++++++
contrib/adc/hub.mkd | 202 ++++++++
contrib/adc/perms | 115 +++++
contrib/adc/pygitolite.py | 77 +++
contrib/adc/rm | 4 +-
contrib/adc/set-head | 17 +
contrib/adc/who-pushed | 2 +-
contrib/autotoc | 35 --
contrib/gerrit.mkd | 2 +-
contrib/gitolite-tools.mkd | 2 +-
contrib/gitweb/gitweb.conf | 44 ++-
contrib/ldap/README.mkd | 6 +-
contrib/vim/README.mkd | 2 +-
doc/1-INSTALL.mkd | 53 ++-
doc/2-admin.mkd | 56 ++-
doc/3-faq-tips-etc.mkd | 285 ++----------
doc/CHANGELOG | 22 +
doc/admin-defined-commands.mkd | 14 +-
doc/big-config.mkd | 14 +-
doc/delegation.mkd | 10 +-
doc/developer-notes.mkd | 213 ++++++++
doc/gitolite.conf.mkd | 469 ++++++++++++++++++
doc/gitolite.rc.mkd | 62 ++-
doc/hook-propagation.mkd | 4 +-
doc/http-backend.mkd | 142 +++++--
doc/migrate.mkd | 10 +-
doc/mirroring.mkd | 21 +-
doc/mob-branches.mkd | 2 +-
doc/monkeysphere.mkd | 2 +
doc/overkill.mkd | 2 +-
doc/packaging.mkd | 2 +-
doc/progit-article.mkd | 14 +-
doc/report-output.mkd | 19 +
doc/shell-games.mkd | 25 +-
doc/ssh-troubleshooting.mkd | 42 ++-
doc/uninstall.mkd | 2 +-
doc/who-uses-it.mkd | 4 +-
doc/wildcard-repositories.mkd | 17 +-
hooks/common/gl-pre-git.hub-sample | 10 +
hooks/common/update | 62 +--
hooks/gitolite-admin/post-update | 8 +-
src/gitolite.pm | 776 +++++++++++++++---------------
src/gitolite_env.pm | 157 ++++++
src/gitolite_rc.pm | 70 +++
src/gl-auth-command | 235 +++------
src/gl-compile-conf | 141 ++----
src/gl-dont-panic | 17 +-
src/gl-easy-install | 16 +-
src/gl-install | 33 +-
src/gl-mirror-shell | 13 +-
src/gl-mirror-sync | 4 +-
src/gl-query-rc | 23 +
src/gl-setup | 47 ++-
src/gl-setup-authkeys | 64 ++--
src/gl-time | 30 +-
src/gl-tool | 9 +-
src/sshkeys-lint | 6 +-
t/README.mkd | 11 +-
t/t53-check-info-expand-output | 16 +
t/t64-write-able | 11 +-
t/t65-rsync | 83 ++++
t/t67-hub | 174 +++++++
t/test-driver.sh | 73 ++--
72 files changed, 3483 insertions(+), 1542 deletions(-)
diff --cc src/gitolite.pm
index 7b4bb31,a880037..5f594d2
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -6,44 -41,22 +41,24 @@@ use Data::Dumper
$Data::Dumper::Deepcopy = 1;
$|++;
- # this file is commonly used using "require". It is not required to use "use"
- # (because it doesn't live in a different package)
++use Net::SSH::AuthorizedKeysFile; # To parse the pubkeyfile with options etc.
+
- # warning: preceding para requires 4th attribute of a programmer after
- # laziness, impatience, and hubris: sense of humour :-)
+ # ----------------------------------------------------------------------------
+ # find the rc file, then pull the libraries
+ # ----------------------------------------------------------------------------
- # WARNING
- # -------
- # the name of this file will change as soon as its function/feature set
- # stabilises enough ;-)
+ BEGIN {
+ die "ENV GL_RC not set\n" unless $ENV{GL_RC};
+ die "ENV GL_BINDIR not set\n" unless $ENV{GL_BINDIR};
+ }
- # right now all it does is
- # - define a function that tells you where to find the rc file
- # - define a function that creates a new repo and give it our update hook
+ use lib $ENV{GL_BINDIR};
+ use gitolite_rc;
# ----------------------------------------------------------------------------
- # common definitions
+ # the big data structures we care about
# ----------------------------------------------------------------------------
- our $ABRT = "\n\t\t***** ABORTING *****\n ";
- our $WARN = "\n\t\t***** WARNING *****\n ";
-
- # commands we're expecting
- our $R_COMMANDS=qr/^(git[ -]upload-pack|git[ -]upload-archive)$/;
- our $W_COMMANDS=qr/^git[ -]receive-pack$/;
-
- # note that REPONAME_PATT allows "/", while USERNAME_PATT does not
- # also, the reason REPONAME_PATT is a superset of USERNAME_PATT is (duh!)
- # because in this version, a repo can have "CREATOR" in the name (see docs)
- our $REPONAME_PATT=qr(^\@?[0-9a-zA-Z][0-9a-zA-Z._\@/+-]*$); # very simple pattern
- our $USERNAME_PATT=qr(^\@?[0-9a-zA-Z][0-9a-zA-Z._\@+-]*$); # very simple pattern
- # same as REPONAME, but used for wildcard repos, allows some common regex metas
- our $REPOPATT_PATT=qr(^\@?[0-9a-zA-Z[][\\^.$|()[\]*+?{}0-9a-zA-Z._\@/-]*$);
- # ADC commands and arguments must match this pattern
- our $ADC_CMD_ARGS_PATT=qr(^[0-9a-zA-Z._\@/+:-]*$);
-
- # these come from the RC file
- our ($REPO_UMASK, $GL_WILDREPOS, $GL_PACKAGE_CONF, $GL_PACKAGE_HOOKS, $REPO_BASE, $GL_CONF_COMPILED, $GL_BIG_CONFIG, $GL_PERFLOGT, $PROJECTS_LIST, $GL_ALL_INCLUDES_SPECIAL, $GL_SITE_INFO, $GL_GET_MEMBERSHIPS_PGM, $GL_WILDREPOS_PERM_CATS);
our %repos;
our %groups;
our %git_configs;
@@@ -828,18 -875,12 +877,18 @@@ sub setup_authkey
# may not be passed; so make sure it's a valid hashref, even if empty
$user_list_p = {} unless $user_list_p;
- # CONSTANTS
+ # LOCAL CONSTANTS
# command and options for authorized_keys
+ my @AUTH_OPTIONS_PRESERVE = ( "from" );
+ my %AUTH_OPTIONS = (
+ "no-port-forwarding" => 1,
+ "no-X11-forwarding" => 1,
+ "no-agent-forwarding" => 1,
+ "no-pty" => 1,
+ );
- my $AUTH_COMMAND="$bindir/gl-auth-command";
- $AUTH_COMMAND="$bindir/gl-time $bindir/gl-auth-command" if $GL_PERFLOGT;
+ my $AUTH_COMMAND="$ENV{GL_BINDIR}/gl-auth-command";
+ $AUTH_COMMAND="$ENV{GL_BINDIR}/gl-time $ENV{GL_BINDIR}/gl-auth-command" if $GL_PERFLOGT;
- my $AUTH_OPTIONS="no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty";
# START
^ permalink raw reply [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-03-25 19:59 Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
0 siblings, 1 reply; 30+ messages in thread
From: Christian Ruppert @ 2011-03-25 19:59 UTC (permalink / raw
To: gentoo-commits
commit: 7b847f5884187c8ae490e521b6d95c47a7556641
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:26:06 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:26:06 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=7b847f58
Merge commit 'refs/top-bases/t/export_key_metadata-function' into t/export_key_metadata-function
README.mkd | 30 +-
conf/example.conf | 243 +---------
conf/example.gitolite.rc | 26 +-
contrib/adc/able | 20 +-
contrib/adc/adc.common-functions | 5 +
contrib/adc/fork | 9 +-
contrib/adc/get-rights-and-owner.in-perl | 15 +-
contrib/adc/git | 123 +++++
contrib/adc/gl-reflog | 8 +-
contrib/adc/hub | 443 +++++++++++++++++
contrib/adc/hub.mkd | 202 ++++++++
contrib/adc/perms | 115 +++++
contrib/adc/pygitolite.py | 77 +++
contrib/adc/rm | 4 +-
contrib/adc/set-head | 17 +
contrib/adc/who-pushed | 2 +-
contrib/autotoc | 35 --
contrib/gerrit.mkd | 2 +-
contrib/gitolite-tools.mkd | 2 +-
contrib/gitweb/gitweb.conf | 44 ++-
contrib/ldap/README.mkd | 6 +-
contrib/vim/README.mkd | 2 +-
doc/1-INSTALL.mkd | 53 ++-
doc/2-admin.mkd | 56 ++-
doc/3-faq-tips-etc.mkd | 285 ++----------
doc/CHANGELOG | 22 +
doc/admin-defined-commands.mkd | 14 +-
doc/big-config.mkd | 14 +-
doc/delegation.mkd | 10 +-
doc/developer-notes.mkd | 213 ++++++++
doc/gitolite.conf.mkd | 469 ++++++++++++++++++
doc/gitolite.rc.mkd | 62 ++-
doc/hook-propagation.mkd | 4 +-
doc/http-backend.mkd | 142 +++++--
doc/migrate.mkd | 10 +-
doc/mirroring.mkd | 21 +-
doc/mob-branches.mkd | 2 +-
doc/monkeysphere.mkd | 2 +
doc/overkill.mkd | 2 +-
doc/packaging.mkd | 2 +-
doc/progit-article.mkd | 14 +-
doc/report-output.mkd | 19 +
doc/shell-games.mkd | 25 +-
doc/ssh-troubleshooting.mkd | 42 ++-
doc/uninstall.mkd | 2 +-
doc/who-uses-it.mkd | 4 +-
doc/wildcard-repositories.mkd | 17 +-
hooks/common/gl-pre-git.hub-sample | 10 +
hooks/common/update | 62 +--
hooks/gitolite-admin/post-update | 8 +-
src/gitolite.pm | 775 +++++++++++++++---------------
src/gitolite_env.pm | 157 ++++++
src/gitolite_rc.pm | 72 +++
src/gl-auth-command | 235 +++------
src/gl-compile-conf | 141 ++----
src/gl-dont-panic | 17 +-
src/gl-easy-install | 16 +-
src/gl-install | 33 +-
src/gl-mirror-shell | 13 +-
src/gl-mirror-sync | 4 +-
src/gl-query-rc | 23 +
src/gl-setup | 47 ++-
src/gl-setup-authkeys | 64 ++--
src/gl-time | 30 +-
src/gl-tool | 9 +-
src/sshkeys-lint | 6 +-
t/README.mkd | 11 +-
t/t53-check-info-expand-output | 16 +
t/t64-write-able | 11 +-
t/t65-rsync | 83 ++++
t/t67-hub | 174 +++++++
t/test-driver.sh | 73 ++--
72 files changed, 3485 insertions(+), 1541 deletions(-)
diff --cc src/gitolite.pm
index 9945e91,a880037..f32bcf0
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -1205,32 -1186,6 +1186,34 @@@ sub find_pubkeys
return sort(@files);
}
+sub export_key_metadata {
+ my $user = shift;
+
+ my @tmp = find_pubkeys($GL_KEYDIR, $user);
+ return if $#tmp ne 0; # one pubkey only!
+
+ my $pubkey = $tmp[0];
+
+ return if ! -f $pubkey;
+
+ open(PUBKEY, '<', $pubkey);
+ while(defined(my $line = <PUBKEY>)) {
+ chomp($line);
+ next if $line !~ m/^\s*#/;
+ $line =~ s/^\s*#\s*//;
+
+ my ($variable, $value) = split(/:\s*/, $line, 2);
+
+ if(grep(/^\Q${variable}\E$/, @GL_METADATA)) {
+ if(length($value) > 0) {
+ $variable =~ s/-/_/g;
+ $ENV{$variable} = $value;
+ }
+ }
+ }
+ close(PUBKEY);
+}
+
+ # ------------------------------------------------------------------------------
+ # per perl rules, this should be the last line in such a file:
1;
diff --cc src/gitolite_rc.pm
index 0000000,09cd172..132fc90
mode 000000,100644..100644
--- a/src/gitolite_rc.pm
+++ b/src/gitolite_rc.pm
@@@ -1,0 -1,70 +1,72 @@@
+ # stuff to help pull in the rc file, plus various constants
+
+ package gitolite_rc;
+ use Exporter 'import';
+
+ # the first set (before the blank line) are constants defined right here in
+ # this program. The second set are from the 'rc'; We're clubbing all in
+ # because they're all "constants" in a programmatic sense
+ @EXPORT = qw(
+ $ABRT $WARN
+ $R_COMMANDS $W_COMMANDS
+ $REPONAME_PATT $USERNAME_PATT $REPOPATT_PATT
+ $ADC_CMD_ARGS_PATT
+ $current_data_version
+
+ $ADMIN_POST_UPDATE_CHAINS_TO $ENV $GITOLITE_BASE $GITOLITE_PATH $GIT_PATH
+ $GL_ADC_PATH $GL_ADMINDIR $GL_ALL_INCLUDES_SPECIAL $GL_ALL_READ_ALL
+ $GL_BIG_CONFIG $GL_CONF $GL_CONF_COMPILED $GL_GET_MEMBERSHIPS_PGM
+ $GL_GITCONFIG_KEYS $GL_GITCONFIG_WILD $GL_KEYDIR $GL_LOGT $GL_NICE_VALUE
+ $GL_NO_CREATE_REPOS $GL_NO_DAEMON_NO_GITWEB $GL_NO_SETUP_AUTHKEYS
+ $GL_PACKAGE_CONF $GL_PACKAGE_HOOKS $GL_PERFLOGT $GL_SITE_INFO
+ $GL_SLAVE_MODE $GL_WILDREPOS $GL_WILDREPOS_DEFPERMS
+ $GL_WILDREPOS_PERM_CATS $HTPASSWD_FILE $PROJECTS_LIST $REPO_BASE
+ $REPO_UMASK $RSYNC_BASE $SVNSERVE $UPDATE_CHAINS_TO
+
+ $GL_HTTP_ANON_USER
++
++ @GL_METADATA
+ );
+
+ # ------------------------------------------------------------------------------
+ # real constants
+ # ------------------------------------------------------------------------------
+
+ $current_data_version = '1.7';
+
+ $ABRT = "\n\t\t***** ABORTING *****\n ";
+ $WARN = "\n\t\t***** WARNING *****\n ";
+
+ # commands we're expecting
+ $R_COMMANDS=qr/^(git[ -]upload-pack|git[ -]upload-archive)$/;
+ $W_COMMANDS=qr/^git[ -]receive-pack$/;
+
+ # note that REPONAME_PATT allows "/", while USERNAME_PATT does not
+ # also, the reason REPONAME_PATT is a superset of USERNAME_PATT is (duh!)
+ # because a repo can have "CREATOR" in the name
+ $REPONAME_PATT=qr(^\@?[0-9a-zA-Z][0-9a-zA-Z._\@/+-]*$);
+ $USERNAME_PATT=qr(^\@?[0-9a-zA-Z][0-9a-zA-Z._\@+-]*$);
+ # same as REPONAME, but used for wildcard repos, allows some common regex metas
+ $REPOPATT_PATT=qr(^\@?[0-9a-zA-Z[][\\^.$|()[\]*+?{}0-9a-zA-Z._\@/-]*$);
+
+ # ADC commands and arguments must match this pattern
+ $ADC_CMD_ARGS_PATT=qr(^[0-9a-zA-Z._\@/+:-]*$);
+
+ # ------------------------------------------------------------------------------
+ # bring in the rc vars and allow querying them
+ # ------------------------------------------------------------------------------
+
+ # in case we're running under Apache using smart http
+ $ENV{HOME} = $ENV{GITOLITE_HTTP_HOME} if $ENV{GITOLITE_HTTP_HOME};
+
+ # we also need to "bring in" the rc variables. The rc can only be in one of
+ # these two places; the first one we find, wins
+ for ("$ENV{HOME}/.gitolite.rc", "/etc/gitolite/gitolite.rc") {
+ $ENV{GL_RC} ||= $_ if -f;
+ }
+ die "no rc file found\n" unless $ENV{GL_RC};
+ do $ENV{GL_RC} or die "error parsing $ENV{GL_RC}\n";
+
+ # ------------------------------------------------------------------------------
+ # per perl rules, this should be the last line in such a file:
+ 1;
^ permalink raw reply [flat|nested] 30+ messages in thread* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
2011-03-25 19:59 [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
@ 2011-03-25 20:00 ` Christian Ruppert
0 siblings, 0 replies; 30+ messages in thread
From: Christian Ruppert @ 2011-03-25 20:00 UTC (permalink / raw
To: gentoo-commits
commit: 7b847f5884187c8ae490e521b6d95c47a7556641
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:26:06 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:26:06 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=7b847f58
Merge commit 'refs/top-bases/t/export_key_metadata-function' into t/export_key_metadata-function
README.mkd | 30 +-
conf/example.conf | 243 +---------
conf/example.gitolite.rc | 26 +-
contrib/adc/able | 20 +-
contrib/adc/adc.common-functions | 5 +
contrib/adc/fork | 9 +-
contrib/adc/get-rights-and-owner.in-perl | 15 +-
contrib/adc/git | 123 +++++
contrib/adc/gl-reflog | 8 +-
contrib/adc/hub | 443 +++++++++++++++++
contrib/adc/hub.mkd | 202 ++++++++
contrib/adc/perms | 115 +++++
contrib/adc/pygitolite.py | 77 +++
contrib/adc/rm | 4 +-
contrib/adc/set-head | 17 +
contrib/adc/who-pushed | 2 +-
contrib/autotoc | 35 --
contrib/gerrit.mkd | 2 +-
contrib/gitolite-tools.mkd | 2 +-
contrib/gitweb/gitweb.conf | 44 ++-
contrib/ldap/README.mkd | 6 +-
contrib/vim/README.mkd | 2 +-
doc/1-INSTALL.mkd | 53 ++-
doc/2-admin.mkd | 56 ++-
doc/3-faq-tips-etc.mkd | 285 ++----------
doc/CHANGELOG | 22 +
doc/admin-defined-commands.mkd | 14 +-
doc/big-config.mkd | 14 +-
doc/delegation.mkd | 10 +-
doc/developer-notes.mkd | 213 ++++++++
doc/gitolite.conf.mkd | 469 ++++++++++++++++++
doc/gitolite.rc.mkd | 62 ++-
doc/hook-propagation.mkd | 4 +-
doc/http-backend.mkd | 142 +++++--
doc/migrate.mkd | 10 +-
doc/mirroring.mkd | 21 +-
doc/mob-branches.mkd | 2 +-
doc/monkeysphere.mkd | 2 +
doc/overkill.mkd | 2 +-
doc/packaging.mkd | 2 +-
doc/progit-article.mkd | 14 +-
doc/report-output.mkd | 19 +
doc/shell-games.mkd | 25 +-
doc/ssh-troubleshooting.mkd | 42 ++-
doc/uninstall.mkd | 2 +-
doc/who-uses-it.mkd | 4 +-
doc/wildcard-repositories.mkd | 17 +-
hooks/common/gl-pre-git.hub-sample | 10 +
hooks/common/update | 62 +--
hooks/gitolite-admin/post-update | 8 +-
src/gitolite.pm | 775 +++++++++++++++---------------
src/gitolite_env.pm | 157 ++++++
src/gitolite_rc.pm | 72 +++
src/gl-auth-command | 235 +++------
src/gl-compile-conf | 141 ++----
src/gl-dont-panic | 17 +-
src/gl-easy-install | 16 +-
src/gl-install | 33 +-
src/gl-mirror-shell | 13 +-
src/gl-mirror-sync | 4 +-
src/gl-query-rc | 23 +
src/gl-setup | 47 ++-
src/gl-setup-authkeys | 64 ++--
src/gl-time | 30 +-
src/gl-tool | 9 +-
src/sshkeys-lint | 6 +-
t/README.mkd | 11 +-
t/t53-check-info-expand-output | 16 +
t/t64-write-able | 11 +-
t/t65-rsync | 83 ++++
t/t67-hub | 174 +++++++
t/test-driver.sh | 73 ++--
72 files changed, 3485 insertions(+), 1541 deletions(-)
diff --cc src/gitolite.pm
index 9945e91,a880037..f32bcf0
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -1205,32 -1186,6 +1186,34 @@@ sub find_pubkeys
return sort(@files);
}
+sub export_key_metadata {
+ my $user = shift;
+
+ my @tmp = find_pubkeys($GL_KEYDIR, $user);
+ return if $#tmp ne 0; # one pubkey only!
+
+ my $pubkey = $tmp[0];
+
+ return if ! -f $pubkey;
+
+ open(PUBKEY, '<', $pubkey);
+ while(defined(my $line = <PUBKEY>)) {
+ chomp($line);
+ next if $line !~ m/^\s*#/;
+ $line =~ s/^\s*#\s*//;
+
+ my ($variable, $value) = split(/:\s*/, $line, 2);
+
+ if(grep(/^\Q${variable}\E$/, @GL_METADATA)) {
+ if(length($value) > 0) {
+ $variable =~ s/-/_/g;
+ $ENV{$variable} = $value;
+ }
+ }
+ }
+ close(PUBKEY);
+}
+
+ # ------------------------------------------------------------------------------
+ # per perl rules, this should be the last line in such a file:
1;
diff --cc src/gitolite_rc.pm
index 0000000,09cd172..132fc90
mode 000000,100644..100644
--- a/src/gitolite_rc.pm
+++ b/src/gitolite_rc.pm
@@@ -1,0 -1,70 +1,72 @@@
+ # stuff to help pull in the rc file, plus various constants
+
+ package gitolite_rc;
+ use Exporter 'import';
+
+ # the first set (before the blank line) are constants defined right here in
+ # this program. The second set are from the 'rc'; We're clubbing all in
+ # because they're all "constants" in a programmatic sense
+ @EXPORT = qw(
+ $ABRT $WARN
+ $R_COMMANDS $W_COMMANDS
+ $REPONAME_PATT $USERNAME_PATT $REPOPATT_PATT
+ $ADC_CMD_ARGS_PATT
+ $current_data_version
+
+ $ADMIN_POST_UPDATE_CHAINS_TO $ENV $GITOLITE_BASE $GITOLITE_PATH $GIT_PATH
+ $GL_ADC_PATH $GL_ADMINDIR $GL_ALL_INCLUDES_SPECIAL $GL_ALL_READ_ALL
+ $GL_BIG_CONFIG $GL_CONF $GL_CONF_COMPILED $GL_GET_MEMBERSHIPS_PGM
+ $GL_GITCONFIG_KEYS $GL_GITCONFIG_WILD $GL_KEYDIR $GL_LOGT $GL_NICE_VALUE
+ $GL_NO_CREATE_REPOS $GL_NO_DAEMON_NO_GITWEB $GL_NO_SETUP_AUTHKEYS
+ $GL_PACKAGE_CONF $GL_PACKAGE_HOOKS $GL_PERFLOGT $GL_SITE_INFO
+ $GL_SLAVE_MODE $GL_WILDREPOS $GL_WILDREPOS_DEFPERMS
+ $GL_WILDREPOS_PERM_CATS $HTPASSWD_FILE $PROJECTS_LIST $REPO_BASE
+ $REPO_UMASK $RSYNC_BASE $SVNSERVE $UPDATE_CHAINS_TO
+
+ $GL_HTTP_ANON_USER
++
++ @GL_METADATA
+ );
+
+ # ------------------------------------------------------------------------------
+ # real constants
+ # ------------------------------------------------------------------------------
+
+ $current_data_version = '1.7';
+
+ $ABRT = "\n\t\t***** ABORTING *****\n ";
+ $WARN = "\n\t\t***** WARNING *****\n ";
+
+ # commands we're expecting
+ $R_COMMANDS=qr/^(git[ -]upload-pack|git[ -]upload-archive)$/;
+ $W_COMMANDS=qr/^git[ -]receive-pack$/;
+
+ # note that REPONAME_PATT allows "/", while USERNAME_PATT does not
+ # also, the reason REPONAME_PATT is a superset of USERNAME_PATT is (duh!)
+ # because a repo can have "CREATOR" in the name
+ $REPONAME_PATT=qr(^\@?[0-9a-zA-Z][0-9a-zA-Z._\@/+-]*$);
+ $USERNAME_PATT=qr(^\@?[0-9a-zA-Z][0-9a-zA-Z._\@+-]*$);
+ # same as REPONAME, but used for wildcard repos, allows some common regex metas
+ $REPOPATT_PATT=qr(^\@?[0-9a-zA-Z[][\\^.$|()[\]*+?{}0-9a-zA-Z._\@/-]*$);
+
+ # ADC commands and arguments must match this pattern
+ $ADC_CMD_ARGS_PATT=qr(^[0-9a-zA-Z._\@/+:-]*$);
+
+ # ------------------------------------------------------------------------------
+ # bring in the rc vars and allow querying them
+ # ------------------------------------------------------------------------------
+
+ # in case we're running under Apache using smart http
+ $ENV{HOME} = $ENV{GITOLITE_HTTP_HOME} if $ENV{GITOLITE_HTTP_HOME};
+
+ # we also need to "bring in" the rc variables. The rc can only be in one of
+ # these two places; the first one we find, wins
+ for ("$ENV{HOME}/.gitolite.rc", "/etc/gitolite/gitolite.rc") {
+ $ENV{GL_RC} ||= $_ if -f;
+ }
+ die "no rc file found\n" unless $ENV{GL_RC};
+ do $ENV{GL_RC} or die "error parsing $ENV{GL_RC}\n";
+
+ # ------------------------------------------------------------------------------
+ # per perl rules, this should be the last line in such a file:
+ 1;
^ permalink raw reply [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-03-25 19:59 Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
0 siblings, 1 reply; 30+ messages in thread
From: Christian Ruppert @ 2011-03-25 19:59 UTC (permalink / raw
To: gentoo-commits
commit: d8dd968616a825bf8958a5d7e6cd245305225fb1
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:20:58 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:20:58 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=d8dd9686
Merge commit 'refs/top-bases/t/find_pubkeys-function' into t/find_pubkeys-function
README.mkd | 30 +-
conf/example.conf | 243 +---------
conf/example.gitolite.rc | 26 +-
contrib/adc/able | 20 +-
contrib/adc/adc.common-functions | 5 +
contrib/adc/fork | 9 +-
contrib/adc/get-rights-and-owner.in-perl | 15 +-
contrib/adc/git | 123 +++++
contrib/adc/gl-reflog | 8 +-
contrib/adc/hub | 443 +++++++++++++++++
contrib/adc/hub.mkd | 202 ++++++++
contrib/adc/perms | 115 +++++
contrib/adc/pygitolite.py | 77 +++
contrib/adc/rm | 4 +-
contrib/adc/set-head | 17 +
contrib/adc/who-pushed | 2 +-
contrib/autotoc | 35 --
contrib/gerrit.mkd | 2 +-
contrib/gitolite-tools.mkd | 2 +-
contrib/gitweb/gitweb.conf | 44 ++-
contrib/ldap/README.mkd | 6 +-
contrib/vim/README.mkd | 2 +-
doc/1-INSTALL.mkd | 53 ++-
doc/2-admin.mkd | 56 ++-
doc/3-faq-tips-etc.mkd | 285 ++----------
doc/CHANGELOG | 22 +
doc/admin-defined-commands.mkd | 14 +-
doc/big-config.mkd | 14 +-
doc/delegation.mkd | 10 +-
doc/developer-notes.mkd | 213 ++++++++
doc/gitolite.conf.mkd | 469 ++++++++++++++++++
doc/gitolite.rc.mkd | 62 ++-
doc/hook-propagation.mkd | 4 +-
doc/http-backend.mkd | 142 +++++--
doc/migrate.mkd | 10 +-
doc/mirroring.mkd | 21 +-
doc/mob-branches.mkd | 2 +-
doc/monkeysphere.mkd | 2 +
doc/overkill.mkd | 2 +-
doc/packaging.mkd | 2 +-
doc/progit-article.mkd | 14 +-
doc/report-output.mkd | 19 +
doc/shell-games.mkd | 25 +-
doc/ssh-troubleshooting.mkd | 42 ++-
doc/uninstall.mkd | 2 +-
doc/who-uses-it.mkd | 4 +-
doc/wildcard-repositories.mkd | 17 +-
hooks/common/gl-pre-git.hub-sample | 10 +
hooks/common/update | 62 +--
hooks/gitolite-admin/post-update | 8 +-
src/gitolite.pm | 775 +++++++++++++++---------------
src/gitolite_env.pm | 157 ++++++
src/gitolite_rc.pm | 70 +++
src/gl-auth-command | 235 +++------
src/gl-compile-conf | 141 ++----
src/gl-dont-panic | 17 +-
src/gl-easy-install | 16 +-
src/gl-install | 33 +-
src/gl-mirror-shell | 13 +-
src/gl-mirror-sync | 4 +-
src/gl-query-rc | 23 +
src/gl-setup | 47 ++-
src/gl-setup-authkeys | 64 ++--
src/gl-time | 30 +-
src/gl-tool | 9 +-
src/sshkeys-lint | 6 +-
t/README.mkd | 11 +-
t/t53-check-info-expand-output | 16 +
t/t64-write-able | 11 +-
t/t65-rsync | 83 ++++
t/t67-hub | 174 +++++++
t/test-driver.sh | 73 ++--
72 files changed, 3483 insertions(+), 1541 deletions(-)
diff --cc src/gitolite.pm
index 7c240dc,c0581c8..a880037
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -1162,47 -1143,6 +1143,49 @@@ sub ext_cmd_svnserv
die "svnserve exec failed\n";
}
+# ----------------------------------------------------------------------------
+# Gentoo specific stuff
+# ----------------------------------------------------------------------------
+
+# Find pubkeys recursive
+sub find_pubkeys {
+ my $dir = shift;
+ my $name = shift;
+ my @files = ();
+ my @tmp = ();
+
+ opendir(my $dir_fh, $dir) or do { print STDERR "Error opendir(): $! '$dir'\n"; return @files; };
+ foreach my $entry (readdir($dir_fh)) {
+ next if $entry =~ /^\.\.?$/; # Skip . and .. entries.
+ $entry = join("/", $dir, $entry);
+
+ if(-f $entry and $entry =~ /\.pub$/) {
+ if(defined($name) && length($name) > 0) {
+ my $cmp = $entry;
+ $cmp =~ s(.*/)();
+ $cmp =~ s/\.pub$//;
+ if($cmp eq $name) {
+ push(@files, $entry);
+ next;
+ }
+ }
+ else {
+ push(@files, $entry);
+ next;
+ }
+ }
+ if(-d $entry) {
+ @tmp = find_pubkeys($entry, $name);
+ @files = (@files, @tmp);
+ next;
+ }
+ }
+
+ closedir($dir_fh);
+
+ return sort(@files);
+}
+
+ # ------------------------------------------------------------------------------
+ # per perl rules, this should be the last line in such a file:
1;
^ permalink raw reply [flat|nested] 30+ messages in thread* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
2011-03-25 19:59 [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
@ 2011-03-25 20:00 ` Christian Ruppert
0 siblings, 0 replies; 30+ messages in thread
From: Christian Ruppert @ 2011-03-25 20:00 UTC (permalink / raw
To: gentoo-commits
commit: d8dd968616a825bf8958a5d7e6cd245305225fb1
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:20:58 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:20:58 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=d8dd9686
Merge commit 'refs/top-bases/t/find_pubkeys-function' into t/find_pubkeys-function
README.mkd | 30 +-
conf/example.conf | 243 +---------
conf/example.gitolite.rc | 26 +-
contrib/adc/able | 20 +-
contrib/adc/adc.common-functions | 5 +
contrib/adc/fork | 9 +-
contrib/adc/get-rights-and-owner.in-perl | 15 +-
contrib/adc/git | 123 +++++
contrib/adc/gl-reflog | 8 +-
contrib/adc/hub | 443 +++++++++++++++++
contrib/adc/hub.mkd | 202 ++++++++
contrib/adc/perms | 115 +++++
contrib/adc/pygitolite.py | 77 +++
contrib/adc/rm | 4 +-
contrib/adc/set-head | 17 +
contrib/adc/who-pushed | 2 +-
contrib/autotoc | 35 --
contrib/gerrit.mkd | 2 +-
contrib/gitolite-tools.mkd | 2 +-
contrib/gitweb/gitweb.conf | 44 ++-
contrib/ldap/README.mkd | 6 +-
contrib/vim/README.mkd | 2 +-
doc/1-INSTALL.mkd | 53 ++-
doc/2-admin.mkd | 56 ++-
doc/3-faq-tips-etc.mkd | 285 ++----------
doc/CHANGELOG | 22 +
doc/admin-defined-commands.mkd | 14 +-
doc/big-config.mkd | 14 +-
doc/delegation.mkd | 10 +-
doc/developer-notes.mkd | 213 ++++++++
doc/gitolite.conf.mkd | 469 ++++++++++++++++++
doc/gitolite.rc.mkd | 62 ++-
doc/hook-propagation.mkd | 4 +-
doc/http-backend.mkd | 142 +++++--
doc/migrate.mkd | 10 +-
doc/mirroring.mkd | 21 +-
doc/mob-branches.mkd | 2 +-
doc/monkeysphere.mkd | 2 +
doc/overkill.mkd | 2 +-
doc/packaging.mkd | 2 +-
doc/progit-article.mkd | 14 +-
doc/report-output.mkd | 19 +
doc/shell-games.mkd | 25 +-
doc/ssh-troubleshooting.mkd | 42 ++-
doc/uninstall.mkd | 2 +-
doc/who-uses-it.mkd | 4 +-
doc/wildcard-repositories.mkd | 17 +-
hooks/common/gl-pre-git.hub-sample | 10 +
hooks/common/update | 62 +--
hooks/gitolite-admin/post-update | 8 +-
src/gitolite.pm | 775 +++++++++++++++---------------
src/gitolite_env.pm | 157 ++++++
src/gitolite_rc.pm | 70 +++
src/gl-auth-command | 235 +++------
src/gl-compile-conf | 141 ++----
src/gl-dont-panic | 17 +-
src/gl-easy-install | 16 +-
src/gl-install | 33 +-
src/gl-mirror-shell | 13 +-
src/gl-mirror-sync | 4 +-
src/gl-query-rc | 23 +
src/gl-setup | 47 ++-
src/gl-setup-authkeys | 64 ++--
src/gl-time | 30 +-
src/gl-tool | 9 +-
src/sshkeys-lint | 6 +-
t/README.mkd | 11 +-
t/t53-check-info-expand-output | 16 +
t/t64-write-able | 11 +-
t/t65-rsync | 83 ++++
t/t67-hub | 174 +++++++
t/test-driver.sh | 73 ++--
72 files changed, 3483 insertions(+), 1541 deletions(-)
diff --cc src/gitolite.pm
index 7c240dc,c0581c8..a880037
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -1162,47 -1143,6 +1143,49 @@@ sub ext_cmd_svnserv
die "svnserve exec failed\n";
}
+# ----------------------------------------------------------------------------
+# Gentoo specific stuff
+# ----------------------------------------------------------------------------
+
+# Find pubkeys recursive
+sub find_pubkeys {
+ my $dir = shift;
+ my $name = shift;
+ my @files = ();
+ my @tmp = ();
+
+ opendir(my $dir_fh, $dir) or do { print STDERR "Error opendir(): $! '$dir'\n"; return @files; };
+ foreach my $entry (readdir($dir_fh)) {
+ next if $entry =~ /^\.\.?$/; # Skip . and .. entries.
+ $entry = join("/", $dir, $entry);
+
+ if(-f $entry and $entry =~ /\.pub$/) {
+ if(defined($name) && length($name) > 0) {
+ my $cmp = $entry;
+ $cmp =~ s(.*/)();
+ $cmp =~ s/\.pub$//;
+ if($cmp eq $name) {
+ push(@files, $entry);
+ next;
+ }
+ }
+ else {
+ push(@files, $entry);
+ next;
+ }
+ }
+ if(-d $entry) {
+ @tmp = find_pubkeys($entry, $name);
+ @files = (@files, @tmp);
+ next;
+ }
+ }
+
+ closedir($dir_fh);
+
+ return sort(@files);
+}
+
+ # ------------------------------------------------------------------------------
+ # per perl rules, this should be the last line in such a file:
1;
^ permalink raw reply [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-03-25 19:59 Christian Ruppert
2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
0 siblings, 1 reply; 30+ messages in thread
From: Christian Ruppert @ 2011-03-25 19:59 UTC (permalink / raw
To: gentoo-commits
commit: 70df640a577386c0e6d10230b1ee68033df8804b
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 16:06:08 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 16:06:08 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=70df640a
Merge commit 'refs/top-bases/t/export-key-metadata' into t/export-key-metadata
src/gl-auth-command | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
^ permalink raw reply [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-03-25 19:59 Christian Ruppert
2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
0 siblings, 1 reply; 30+ messages in thread
From: Christian Ruppert @ 2011-03-25 19:59 UTC (permalink / raw
To: gentoo-commits
commit: d86923ab49e0a48fdefa414a133d6922fa2dcdff
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 16:05:54 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 16:05:54 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=d86923ab
Merge commit 'refs/top-bases/t/export_key_metadata-function' into t/export_key_metadata-function
src/gl-auth-command | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
^ permalink raw reply [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-03-25 19:59 Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
0 siblings, 1 reply; 30+ messages in thread
From: Christian Ruppert @ 2011-03-25 19:59 UTC (permalink / raw
To: gentoo-commits
commit: b97115f85bf0380824e1abbc933d5bed40a31a01
Author: Sitaram Chamarty <sitaram <AT> atc <DOT> tcs <DOT> com>
AuthorDate: Tue Feb 15 09:40:14 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 09:40:14 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=b97115f8
Merge branch 'master' into pu
^ permalink raw reply [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/find_pubkeys-function commit in: /
@ 2011-02-16 16:07 Christian Ruppert
2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
0 siblings, 1 reply; 30+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
To: gentoo-commits
commit: 955f5e67a58b4f6e91a2a6b7e1dd73b7bfb67f03
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 16:05:43 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 16:05:43 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=955f5e67
Merge commit 'refs/top-bases/t/find_pubkeys-function' into t/find_pubkeys-function
src/gl-auth-command | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
^ permalink raw reply [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function commit in: /
@ 2011-02-16 16:07 Christian Ruppert
2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
0 siblings, 1 reply; 30+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
To: gentoo-commits
commit: 699ecfcb0cfcd49652910984e6428d8f84176205
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 16:05:54 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 16:05:54 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=699ecfcb
Merge branch 't/find_pubkeys-function' into refs/top-bases/t/export_key_metadata-function
.topdeps | 2 +-
src/gl-auth-command | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
^ permalink raw reply [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
@ 2011-02-16 16:07 Christian Ruppert
0 siblings, 0 replies; 30+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
To: gentoo-commits
commit: 28b68a153d3ad6500a5da56337a771ab1ebe49fe
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 16:06:08 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 16:06:08 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=28b68a15
Merge branch 't/ssh-key-options' into refs/top-bases/t/export-key-metadata
^ permalink raw reply [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
@ 2011-02-16 16:07 Christian Ruppert
0 siblings, 0 replies; 30+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
To: gentoo-commits
commit: 706abcc91bc0867e75e270f205720d7a4d2a424a
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 16:06:01 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 16:06:01 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=706abcc9
Merge commit 'refs/top-bases/t/ssh-key-options' into t/ssh-key-options
src/gl-auth-command | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
^ permalink raw reply [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
@ 2011-02-16 16:07 Christian Ruppert
0 siblings, 0 replies; 30+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
To: gentoo-commits
commit: 56b220a230ed10effc1d473e4a0326f99c12f35e
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 16:06:08 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 16:06:08 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=56b220a2
Merge branch 't/export_key_metadata-function' into refs/top-bases/t/export-key-metadata
src/gl-auth-command | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
^ permalink raw reply [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
@ 2011-02-16 16:07 Christian Ruppert
0 siblings, 0 replies; 30+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
To: gentoo-commits
commit: a13ed1454bfd839ea26c1af3b8a35061f9b70f2f
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 16:06:01 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 16:06:01 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=a13ed145
Merge branch 't/find_pubkeys-function' into refs/top-bases/t/ssh-key-options
.topdeps | 2 +-
src/gl-auth-command | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
^ permalink raw reply [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:master commit in: /
@ 2011-02-16 16:07 Christian Ruppert
2011-02-15 16:42 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
0 siblings, 1 reply; 30+ messages in thread
From: Christian Ruppert @ 2011-02-16 16:07 UTC (permalink / raw
To: gentoo-commits
commit: 0089df5141c77058b13883587e6504aeeef4a6ed
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:30:40 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:30:40 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=0089df51
Merge branch 't/export_key_metadata-function' into refs/top-bases/t/export-key-metadata
conf/example.conf | 3 -
conf/example.gitolite.rc | 329 +++-----------------
contrib/adc/get-rights-and-owner.in-perl | 41 +++
contrib/ldap/README.mkd | 18 ++
contrib/ldap/ldap-query-example.pl | 80 +++++
contrib/ldap/ldap-query-example.sh | 68 +++++
contrib/ldap/passwd | 112 +++++++
doc/CHANGELOG | 22 ++
doc/big-config.mkd | 229 ++++++++++----
doc/delegation.mkd | 2 +-
doc/gitolite.rc.mkd | 332 +++++++++++++++++++++
doc/install-transcript.mkd | 2 +-
doc/overkill.mkd | 8 +-
doc/progit-article.mkd | 2 +-
doc/ssh-troubleshooting.mkd | 2 +-
doc/who-uses-it.mkd | 5 +
src/gitolite.pm | 124 +++++----
src/gl-auth-command | 14 +-
src/gl-compile-conf | 164 +++++++----
t/out/t01-repo-groups.1 | 2 +-
t/out/t01-repo-groups.1b | 2 +-
t/out/{t01-repo-groups.1b => t01-repo-groups.1bs} | 33 ++-
t/out/t01-repo-groups.2 | 28 ++-
t/out/t02-user-groups.1 | 2 +-
t/out/t02-user-groups.1b | 2 +-
t/out/{t02-user-groups.1b => t02-user-groups.1bs} | 35 +--
t/out/t02-user-groups.2 | 2 +-
t/out/{t02-user-groups.2 => t02-user-groups.2bs} | 49 ++--
t/t01-repo-groups | 6 +-
t/t02-user-groups | 8 +-
t/t59-repo-not-on-disk | 12 +-
t/test-driver.sh | 7 +
32 files changed, 1195 insertions(+), 550 deletions(-)
^ permalink raw reply [flat|nested] 30+ messages in thread* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
2011-02-16 16:07 [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
@ 2011-02-15 16:42 ` Christian Ruppert
0 siblings, 0 replies; 30+ messages in thread
From: Christian Ruppert @ 2011-02-15 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 0089df5141c77058b13883587e6504aeeef4a6ed
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:30:40 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:30:40 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=0089df51
Merge branch 't/export_key_metadata-function' into refs/top-bases/t/export-key-metadata
conf/example.conf | 3 -
conf/example.gitolite.rc | 329 +++-----------------
contrib/adc/get-rights-and-owner.in-perl | 41 +++
contrib/ldap/README.mkd | 18 ++
contrib/ldap/ldap-query-example.pl | 80 +++++
contrib/ldap/ldap-query-example.sh | 68 +++++
contrib/ldap/passwd | 112 +++++++
doc/CHANGELOG | 22 ++
doc/big-config.mkd | 229 ++++++++++----
doc/delegation.mkd | 2 +-
doc/gitolite.rc.mkd | 332 +++++++++++++++++++++
doc/install-transcript.mkd | 2 +-
doc/overkill.mkd | 8 +-
doc/progit-article.mkd | 2 +-
doc/ssh-troubleshooting.mkd | 2 +-
doc/who-uses-it.mkd | 5 +
src/gitolite.pm | 124 +++++----
src/gl-auth-command | 14 +-
src/gl-compile-conf | 164 +++++++----
t/out/t01-repo-groups.1 | 2 +-
t/out/t01-repo-groups.1b | 2 +-
t/out/{t01-repo-groups.1b => t01-repo-groups.1bs} | 33 ++-
t/out/t01-repo-groups.2 | 28 ++-
t/out/t02-user-groups.1 | 2 +-
t/out/t02-user-groups.1b | 2 +-
t/out/{t02-user-groups.1b => t02-user-groups.1bs} | 35 +--
t/out/t02-user-groups.2 | 2 +-
t/out/{t02-user-groups.2 => t02-user-groups.2bs} | 49 ++--
t/t01-repo-groups | 6 +-
t/t02-user-groups | 8 +-
t/t59-repo-not-on-disk | 12 +-
t/test-driver.sh | 7 +
32 files changed, 1195 insertions(+), 550 deletions(-)
^ permalink raw reply [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/find_pubkeys-function commit in: /
@ 2011-02-15 16:42 Christian Ruppert
2011-02-15 16:42 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
0 siblings, 1 reply; 30+ messages in thread
From: Christian Ruppert @ 2011-02-15 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 1f0bc3731de5cd240186656817cf54a7ce81cacb
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:25:53 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:25:53 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=1f0bc373
Merge commit 'refs/top-bases/t/find_pubkeys-function' into t/find_pubkeys-function
conf/example.conf | 3 -
conf/example.gitolite.rc | 329 +++-----------------
contrib/adc/get-rights-and-owner.in-perl | 41 +++
contrib/ldap/README.mkd | 18 ++
contrib/ldap/ldap-query-example.pl | 80 +++++
contrib/ldap/ldap-query-example.sh | 68 +++++
contrib/ldap/passwd | 112 +++++++
doc/CHANGELOG | 22 ++
doc/big-config.mkd | 229 ++++++++++----
doc/delegation.mkd | 2 +-
doc/gitolite.rc.mkd | 332 +++++++++++++++++++++
doc/install-transcript.mkd | 2 +-
doc/overkill.mkd | 8 +-
doc/progit-article.mkd | 2 +-
doc/ssh-troubleshooting.mkd | 2 +-
doc/who-uses-it.mkd | 5 +
src/gitolite.pm | 124 +++++----
src/gl-auth-command | 14 +-
src/gl-compile-conf | 164 +++++++----
t/out/t01-repo-groups.1 | 2 +-
t/out/t01-repo-groups.1b | 2 +-
t/out/{t01-repo-groups.1b => t01-repo-groups.1bs} | 33 ++-
t/out/t01-repo-groups.2 | 28 ++-
t/out/t02-user-groups.1 | 2 +-
t/out/t02-user-groups.1b | 2 +-
t/out/{t02-user-groups.1b => t02-user-groups.1bs} | 35 +--
t/out/t02-user-groups.2 | 2 +-
t/out/{t02-user-groups.2 => t02-user-groups.2bs} | 49 ++--
t/t01-repo-groups | 6 +-
t/t02-user-groups | 8 +-
t/t59-repo-not-on-disk | 12 +-
t/test-driver.sh | 7 +
32 files changed, 1195 insertions(+), 550 deletions(-)
^ permalink raw reply [flat|nested] 30+ messages in thread* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
2011-02-15 16:42 [gentoo-commits] proj/gitolite-gentoo:t/find_pubkeys-function " Christian Ruppert
@ 2011-02-15 16:42 ` Christian Ruppert
0 siblings, 0 replies; 30+ messages in thread
From: Christian Ruppert @ 2011-02-15 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 1f0bc3731de5cd240186656817cf54a7ce81cacb
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:25:53 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:25:53 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=1f0bc373
Merge commit 'refs/top-bases/t/find_pubkeys-function' into t/find_pubkeys-function
conf/example.conf | 3 -
conf/example.gitolite.rc | 329 +++-----------------
contrib/adc/get-rights-and-owner.in-perl | 41 +++
contrib/ldap/README.mkd | 18 ++
contrib/ldap/ldap-query-example.pl | 80 +++++
contrib/ldap/ldap-query-example.sh | 68 +++++
contrib/ldap/passwd | 112 +++++++
doc/CHANGELOG | 22 ++
doc/big-config.mkd | 229 ++++++++++----
doc/delegation.mkd | 2 +-
doc/gitolite.rc.mkd | 332 +++++++++++++++++++++
doc/install-transcript.mkd | 2 +-
doc/overkill.mkd | 8 +-
doc/progit-article.mkd | 2 +-
doc/ssh-troubleshooting.mkd | 2 +-
doc/who-uses-it.mkd | 5 +
src/gitolite.pm | 124 +++++----
src/gl-auth-command | 14 +-
src/gl-compile-conf | 164 +++++++----
t/out/t01-repo-groups.1 | 2 +-
t/out/t01-repo-groups.1b | 2 +-
t/out/{t01-repo-groups.1b => t01-repo-groups.1bs} | 33 ++-
t/out/t01-repo-groups.2 | 28 ++-
t/out/t02-user-groups.1 | 2 +-
t/out/t02-user-groups.1b | 2 +-
t/out/{t02-user-groups.1b => t02-user-groups.1bs} | 35 +--
t/out/t02-user-groups.2 | 2 +-
t/out/{t02-user-groups.2 => t02-user-groups.2bs} | 49 ++--
t/t01-repo-groups | 6 +-
t/t02-user-groups | 8 +-
t/t59-repo-not-on-disk | 12 +-
t/test-driver.sh | 7 +
32 files changed, 1195 insertions(+), 550 deletions(-)
^ permalink raw reply [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function commit in: /
@ 2011-02-15 16:42 Christian Ruppert
2011-02-15 16:42 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
0 siblings, 1 reply; 30+ messages in thread
From: Christian Ruppert @ 2011-02-15 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 11f659902acb67987d72a88ced6f86cb99420d04
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:26:22 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:26:22 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=11f65990
Merge commit 'refs/top-bases/t/export_key_metadata-function' into t/export_key_metadata-function
conf/example.conf | 3 -
conf/example.gitolite.rc | 329 +++-----------------
contrib/adc/get-rights-and-owner.in-perl | 41 +++
contrib/ldap/README.mkd | 18 ++
contrib/ldap/ldap-query-example.pl | 80 +++++
contrib/ldap/ldap-query-example.sh | 68 +++++
contrib/ldap/passwd | 112 +++++++
doc/CHANGELOG | 22 ++
doc/big-config.mkd | 229 ++++++++++----
doc/delegation.mkd | 2 +-
doc/gitolite.rc.mkd | 332 +++++++++++++++++++++
doc/install-transcript.mkd | 2 +-
doc/overkill.mkd | 8 +-
doc/progit-article.mkd | 2 +-
doc/ssh-troubleshooting.mkd | 2 +-
doc/who-uses-it.mkd | 5 +
src/gitolite.pm | 124 +++++----
src/gl-auth-command | 14 +-
src/gl-compile-conf | 164 +++++++----
t/out/t01-repo-groups.1 | 2 +-
t/out/t01-repo-groups.1b | 2 +-
t/out/{t01-repo-groups.1b => t01-repo-groups.1bs} | 33 ++-
t/out/t01-repo-groups.2 | 28 ++-
t/out/t02-user-groups.1 | 2 +-
t/out/t02-user-groups.1b | 2 +-
t/out/{t02-user-groups.1b => t02-user-groups.1bs} | 35 +--
t/out/t02-user-groups.2 | 2 +-
t/out/{t02-user-groups.2 => t02-user-groups.2bs} | 49 ++--
t/t01-repo-groups | 6 +-
t/t02-user-groups | 8 +-
t/t59-repo-not-on-disk | 12 +-
t/test-driver.sh | 7 +
32 files changed, 1195 insertions(+), 550 deletions(-)
diff --cc src/gitolite.pm
index efd9bed,7c240dc..9945e91
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -40,12 -40,17 +40,17 @@@ our $REPOPATT_PATT=qr(^\@?[0-9a-zA-Z[][
our $ADC_CMD_ARGS_PATT=qr(^[0-9a-zA-Z._\@/+:-]*$);
# these come from the RC file
-our ($REPO_UMASK, $GL_WILDREPOS, $GL_PACKAGE_CONF, $GL_PACKAGE_HOOKS, $REPO_BASE, $GL_CONF_COMPILED, $GL_BIG_CONFIG, $GL_PERFLOGT, $PROJECTS_LIST, $GL_ALL_INCLUDES_SPECIAL, $GL_SITE_INFO, $GL_GET_MEMBERSHIPS_PGM, $GL_WILDREPOS_PERM_CATS);
+our ($REPO_UMASK, $GL_WILDREPOS, $GL_PACKAGE_CONF, $GL_PACKAGE_HOOKS, $REPO_BASE, $GL_CONF_COMPILED, $GL_BIG_CONFIG, $GL_PERFLOGT, $PROJECTS_LIST, $GL_ALL_INCLUDES_SPECIAL, $GL_SITE_INFO, $GL_GET_MEMBERSHIPS_PGM, $GL_WILDREPOS_PERM_CATS, $GL_KEYDIR, @GL_METADATA);
our %repos;
our %groups;
- our %repo_config;
+ our %git_configs;
+ our %split_conf;;
our $data_version;
- our $current_data_version = '1.6';
+ our $current_data_version = '1.7';
+
+ # the following are read in from individual repo's gl-conf files, if present
+ our %one_repo;
+ our %one_git_config;
# ----------------------------------------------------------------------------
# convenience subs
^ permalink raw reply [flat|nested] 30+ messages in thread* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
2011-02-15 16:42 [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function " Christian Ruppert
@ 2011-02-15 16:42 ` Christian Ruppert
0 siblings, 0 replies; 30+ messages in thread
From: Christian Ruppert @ 2011-02-15 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 11f659902acb67987d72a88ced6f86cb99420d04
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:26:22 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:26:22 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=11f65990
Merge commit 'refs/top-bases/t/export_key_metadata-function' into t/export_key_metadata-function
conf/example.conf | 3 -
conf/example.gitolite.rc | 329 +++-----------------
contrib/adc/get-rights-and-owner.in-perl | 41 +++
contrib/ldap/README.mkd | 18 ++
contrib/ldap/ldap-query-example.pl | 80 +++++
contrib/ldap/ldap-query-example.sh | 68 +++++
contrib/ldap/passwd | 112 +++++++
doc/CHANGELOG | 22 ++
doc/big-config.mkd | 229 ++++++++++----
doc/delegation.mkd | 2 +-
doc/gitolite.rc.mkd | 332 +++++++++++++++++++++
doc/install-transcript.mkd | 2 +-
doc/overkill.mkd | 8 +-
doc/progit-article.mkd | 2 +-
doc/ssh-troubleshooting.mkd | 2 +-
doc/who-uses-it.mkd | 5 +
src/gitolite.pm | 124 +++++----
src/gl-auth-command | 14 +-
src/gl-compile-conf | 164 +++++++----
t/out/t01-repo-groups.1 | 2 +-
t/out/t01-repo-groups.1b | 2 +-
t/out/{t01-repo-groups.1b => t01-repo-groups.1bs} | 33 ++-
t/out/t01-repo-groups.2 | 28 ++-
t/out/t02-user-groups.1 | 2 +-
t/out/t02-user-groups.1b | 2 +-
t/out/{t02-user-groups.1b => t02-user-groups.1bs} | 35 +--
t/out/t02-user-groups.2 | 2 +-
t/out/{t02-user-groups.2 => t02-user-groups.2bs} | 49 ++--
t/t01-repo-groups | 6 +-
t/t02-user-groups | 8 +-
t/t59-repo-not-on-disk | 12 +-
t/test-driver.sh | 7 +
32 files changed, 1195 insertions(+), 550 deletions(-)
diff --cc src/gitolite.pm
index efd9bed,7c240dc..9945e91
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -40,12 -40,17 +40,17 @@@ our $REPOPATT_PATT=qr(^\@?[0-9a-zA-Z[][
our $ADC_CMD_ARGS_PATT=qr(^[0-9a-zA-Z._\@/+:-]*$);
# these come from the RC file
-our ($REPO_UMASK, $GL_WILDREPOS, $GL_PACKAGE_CONF, $GL_PACKAGE_HOOKS, $REPO_BASE, $GL_CONF_COMPILED, $GL_BIG_CONFIG, $GL_PERFLOGT, $PROJECTS_LIST, $GL_ALL_INCLUDES_SPECIAL, $GL_SITE_INFO, $GL_GET_MEMBERSHIPS_PGM, $GL_WILDREPOS_PERM_CATS);
+our ($REPO_UMASK, $GL_WILDREPOS, $GL_PACKAGE_CONF, $GL_PACKAGE_HOOKS, $REPO_BASE, $GL_CONF_COMPILED, $GL_BIG_CONFIG, $GL_PERFLOGT, $PROJECTS_LIST, $GL_ALL_INCLUDES_SPECIAL, $GL_SITE_INFO, $GL_GET_MEMBERSHIPS_PGM, $GL_WILDREPOS_PERM_CATS, $GL_KEYDIR, @GL_METADATA);
our %repos;
our %groups;
- our %repo_config;
+ our %git_configs;
+ our %split_conf;;
our $data_version;
- our $current_data_version = '1.6';
+ our $current_data_version = '1.7';
+
+ # the following are read in from individual repo's gl-conf files, if present
+ our %one_repo;
+ our %one_git_config;
# ----------------------------------------------------------------------------
# convenience subs
^ permalink raw reply [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function commit in: /
@ 2011-02-15 16:42 Christian Ruppert
2011-02-15 16:42 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
0 siblings, 1 reply; 30+ messages in thread
From: Christian Ruppert @ 2011-02-15 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 96788a960e002d0480a2ebf47908d99da9678e1d
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:26:22 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:26:22 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=96788a96
Merge branch 't/find_pubkeys-function' into refs/top-bases/t/export_key_metadata-function
.topdeps | 2 +-
conf/example.conf | 3 -
conf/example.gitolite.rc | 329 +++-----------------
contrib/adc/get-rights-and-owner.in-perl | 41 +++
contrib/ldap/README.mkd | 18 ++
contrib/ldap/ldap-query-example.pl | 80 +++++
contrib/ldap/ldap-query-example.sh | 68 +++++
contrib/ldap/passwd | 112 +++++++
doc/CHANGELOG | 22 ++
doc/big-config.mkd | 229 ++++++++++----
doc/delegation.mkd | 2 +-
doc/gitolite.rc.mkd | 332 +++++++++++++++++++++
doc/install-transcript.mkd | 2 +-
doc/overkill.mkd | 8 +-
doc/progit-article.mkd | 2 +-
doc/ssh-troubleshooting.mkd | 2 +-
doc/who-uses-it.mkd | 5 +
src/gitolite.pm | 124 +++++----
src/gl-auth-command | 14 +-
src/gl-compile-conf | 164 +++++++----
t/out/t01-repo-groups.1 | 2 +-
t/out/t01-repo-groups.1b | 2 +-
t/out/{t01-repo-groups.1b => t01-repo-groups.1bs} | 33 ++-
t/out/t01-repo-groups.2 | 28 ++-
t/out/t02-user-groups.1 | 2 +-
t/out/t02-user-groups.1b | 2 +-
t/out/{t02-user-groups.1b => t02-user-groups.1bs} | 35 +--
t/out/t02-user-groups.2 | 2 +-
t/out/{t02-user-groups.2 => t02-user-groups.2bs} | 49 ++--
t/t01-repo-groups | 6 +-
t/t02-user-groups | 8 +-
t/t59-repo-not-on-disk | 12 +-
t/test-driver.sh | 7 +
33 files changed, 1196 insertions(+), 551 deletions(-)
^ permalink raw reply [flat|nested] 30+ messages in thread* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
2011-02-15 16:42 [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function " Christian Ruppert
@ 2011-02-15 16:42 ` Christian Ruppert
0 siblings, 0 replies; 30+ messages in thread
From: Christian Ruppert @ 2011-02-15 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 96788a960e002d0480a2ebf47908d99da9678e1d
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:26:22 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:26:22 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=96788a96
Merge branch 't/find_pubkeys-function' into refs/top-bases/t/export_key_metadata-function
.topdeps | 2 +-
conf/example.conf | 3 -
conf/example.gitolite.rc | 329 +++-----------------
contrib/adc/get-rights-and-owner.in-perl | 41 +++
contrib/ldap/README.mkd | 18 ++
contrib/ldap/ldap-query-example.pl | 80 +++++
contrib/ldap/ldap-query-example.sh | 68 +++++
contrib/ldap/passwd | 112 +++++++
doc/CHANGELOG | 22 ++
doc/big-config.mkd | 229 ++++++++++----
doc/delegation.mkd | 2 +-
doc/gitolite.rc.mkd | 332 +++++++++++++++++++++
doc/install-transcript.mkd | 2 +-
doc/overkill.mkd | 8 +-
doc/progit-article.mkd | 2 +-
doc/ssh-troubleshooting.mkd | 2 +-
doc/who-uses-it.mkd | 5 +
src/gitolite.pm | 124 +++++----
src/gl-auth-command | 14 +-
src/gl-compile-conf | 164 +++++++----
t/out/t01-repo-groups.1 | 2 +-
t/out/t01-repo-groups.1b | 2 +-
t/out/{t01-repo-groups.1b => t01-repo-groups.1bs} | 33 ++-
t/out/t01-repo-groups.2 | 28 ++-
t/out/t02-user-groups.1 | 2 +-
t/out/t02-user-groups.1b | 2 +-
t/out/{t02-user-groups.1b => t02-user-groups.1bs} | 35 +--
t/out/t02-user-groups.2 | 2 +-
t/out/{t02-user-groups.2 => t02-user-groups.2bs} | 49 ++--
t/t01-repo-groups | 6 +-
t/t02-user-groups | 8 +-
t/t59-repo-not-on-disk | 12 +-
t/test-driver.sh | 7 +
33 files changed, 1196 insertions(+), 551 deletions(-)
^ permalink raw reply [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
@ 2011-02-15 16:42 Christian Ruppert
0 siblings, 0 replies; 30+ messages in thread
From: Christian Ruppert @ 2011-02-15 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 473c02d9cf850c2afca1a741ce1588d45571d82b
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:29:16 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:29:16 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=473c02d9
Merge commit 'refs/top-bases/t/ssh-key-options' into t/ssh-key-options
conf/example.conf | 3 -
conf/example.gitolite.rc | 329 +++-----------------
contrib/adc/get-rights-and-owner.in-perl | 41 +++
contrib/ldap/README.mkd | 18 ++
contrib/ldap/ldap-query-example.pl | 80 +++++
contrib/ldap/ldap-query-example.sh | 68 +++++
contrib/ldap/passwd | 112 +++++++
doc/CHANGELOG | 22 ++
doc/big-config.mkd | 229 ++++++++++----
doc/delegation.mkd | 2 +-
doc/gitolite.rc.mkd | 332 +++++++++++++++++++++
doc/install-transcript.mkd | 2 +-
doc/overkill.mkd | 8 +-
doc/progit-article.mkd | 2 +-
doc/ssh-troubleshooting.mkd | 2 +-
doc/who-uses-it.mkd | 5 +
src/gitolite.pm | 124 +++++----
src/gl-auth-command | 14 +-
src/gl-compile-conf | 164 +++++++----
t/out/t01-repo-groups.1 | 2 +-
t/out/t01-repo-groups.1b | 2 +-
t/out/{t01-repo-groups.1b => t01-repo-groups.1bs} | 33 ++-
t/out/t01-repo-groups.2 | 28 ++-
t/out/t02-user-groups.1 | 2 +-
t/out/t02-user-groups.1b | 2 +-
t/out/{t02-user-groups.1b => t02-user-groups.1bs} | 35 +--
t/out/t02-user-groups.2 | 2 +-
t/out/{t02-user-groups.2 => t02-user-groups.2bs} | 49 ++--
t/t01-repo-groups | 6 +-
t/t02-user-groups | 8 +-
t/t59-repo-not-on-disk | 12 +-
t/test-driver.sh | 7 +
32 files changed, 1195 insertions(+), 550 deletions(-)
^ permalink raw reply [flat|nested] 30+ messages in thread* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
@ 2011-02-15 16:42 Christian Ruppert
0 siblings, 0 replies; 30+ messages in thread
From: Christian Ruppert @ 2011-02-15 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 31d2fda620e998c6e13693cf6fae5477f139be52
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:30:40 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:30:40 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=31d2fda6
Merge branch 't/ssh-key-options' into refs/top-bases/t/export-key-metadata
^ permalink raw reply [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
@ 2011-02-15 16:42 Christian Ruppert
0 siblings, 0 replies; 30+ messages in thread
From: Christian Ruppert @ 2011-02-15 16:42 UTC (permalink / raw
To: gentoo-commits
commit: e24d0debc5565599c4eef70f6a3be602977d0f02
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:35:55 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:35:55 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=e24d0deb
Merge commit 'refs/top-bases/t/export-key-metadata' into t/export-key-metadata
Conflicts:
conf/example.gitolite.rc
src/gl-auth-command
conf/example.conf | 3 -
conf/example.gitolite.rc | 334 +++-----------------
contrib/adc/get-rights-and-owner.in-perl | 41 +++
contrib/ldap/README.mkd | 18 ++
contrib/ldap/ldap-query-example.pl | 80 +++++
contrib/ldap/ldap-query-example.sh | 68 +++++
contrib/ldap/passwd | 112 +++++++
doc/CHANGELOG | 22 ++
doc/big-config.mkd | 229 ++++++++++----
doc/delegation.mkd | 2 +-
doc/gitolite.rc.mkd | 332 ++++++++++++++++++++
doc/install-transcript.mkd | 2 +-
doc/overkill.mkd | 8 +-
doc/progit-article.mkd | 2 +-
doc/ssh-troubleshooting.mkd | 2 +-
doc/who-uses-it.mkd | 5 +
src/gitolite.pm | 124 +++++----
src/gl-auth-command | 14 +-
src/gl-compile-conf | 164 +++++++----
t/out/t01-repo-groups.1 | 2 +-
t/out/t01-repo-groups.1b | 2 +-
t/out/{t01-repo-groups.1b => t01-repo-groups.1bs} | 33 ++-
t/out/t01-repo-groups.2 | 28 ++-
t/out/t02-user-groups.1 | 2 +-
t/out/t02-user-groups.1b | 2 +-
t/out/{t02-user-groups.1b => t02-user-groups.1bs} | 35 +--
t/out/t02-user-groups.2 | 2 +-
t/out/{t02-user-groups.2 => t02-user-groups.2bs} | 49 ++--
t/t01-repo-groups | 6 +-
t/t02-user-groups | 8 +-
t/t59-repo-not-on-disk | 12 +-
t/test-driver.sh | 7 +
32 files changed, 1198 insertions(+), 552 deletions(-)
diff --cc conf/example.gitolite.rc
index 211b7cb,9ee7840..6f57994
--- a/conf/example.gitolite.rc
+++ b/conf/example.gitolite.rc
@@@ -61,260 -14,65 +14,73 @@@ $GL_ADMINDIR=$ENV{HOME} . "/.gitolite"
$GL_CONF="$GL_ADMINDIR/conf/gitolite.conf";
$GL_KEYDIR="$GL_ADMINDIR/keydir";
$GL_CONF_COMPILED="$GL_ADMINDIR/conf/gitolite.conf-compiled.pm";
+ # DO NOT CHANGE THE NEXT TWO LINES UNLESS YOU REALLY KNOW WHAT YOU'RE DOING.
+ # These variables are set automatically by the install method you choose.
+ # $GL_PACKAGE_CONF = "";
+ # $GL_PACKAGE_HOOKS = "";
- # --------------------------------------
-
- # if git on your server is on a standard path (that is
- # ssh git@server git --version
- # works), leave this setting as is. Otherwise, choose one of the
- # alternatives, or write your own
-
- $GIT_PATH="";
- # $GIT_PATH="/opt/bin/";
-
- # --------------------------------------
-
- # ----------------------------------------------------------------------
- # BIG CONFIG SETTINGS
-
- # Please read doc/big-config.mkd for details
+ # ------------------------------------------------------------------------------
+ # most often used/changed variables
+ # ------------------------------------------------------------------------------
+ $GL_WILDREPOS = 0;
+ $PROJECTS_LIST = $ENV{HOME} . "/projects.list";
+ $REPO_UMASK = 0077;
+ # ------------------------------------------------------------------------------
+ # variables with an efficiency impact
+ # ------------------------------------------------------------------------------
$GL_BIG_CONFIG = 0;
$GL_NO_DAEMON_NO_GITWEB = 0;
- $GL_NO_CREATE_REPOS = 0;
- $GL_NO_SETUP_AUTHKEYS = 0;
-
- # ----------------------------------------------------------------------
- # SECURITY SENSITIVE SETTINGS
- #
- # Settings below this point may have security implications. That
- # usually means that I have not thought hard enough about all the
- # possible ways to crack security if these settings are enabled.
-
- # Please see details on each setting for specifics, if any.
- # ----------------------------------------------------------------------
-
+# Define which metadata variables shall be exported to the gitolite environment.
+# Those variables can be used in hooks, e.g. for cia.vc
+# A pubkey file might contain one or more of those variable.
+# They can be defined by e.g:"# git-username: idl0r"
+# Each '-' (dash) will be replaced by an '_' (underscore).
- @GL_METADATA = ( "git-username", "git-email", "git-realname", "git-realname-ascii", "cia-vc-username" );
- @GL_METADATA_REQUIRED = ( "git-username", "git-email", "git-realname" );
-
- # --------------------------------------
- # ALLOW REPO ADMIN TO SET GITCONFIG KEYS
- #
- # Gitolite allows you to set git repo options using the "config" keyword; see
- # conf/example.conf for details and syntax.
- #
- # However, if you are in an installation where the repo admin does not (and
- # should not) have shell access to the server, then allowing him to set
- # arbitrary repo config options *may* be a security risk -- some config
- # settings may allow executing arbitrary commands.
- #
- # You have 3 choices. By default $GL_GITCONFIG_KEYS is left empty, which
- # completely disables this feature (meaning you cannot set git configs from
- # the repo config).
-
++#@GL_METADATA = ( "git-username", "git-email", "git-realname", "git-realname-ascii", "cia-vc-username" );
++#@GL_METADATA_REQUIRED = ( "git-username", "git-email", "git-realname" );
++
+ # ------------------------------------------------------------------------------
+ # VARIABLES WITH A SECURITY IMPACT. READ DOC WELL BEFORE CHANGING THESE.
+ # http://github.com/sitaramc/gitolite/blob/pu/doc/gitolite.rc.mkd#_variables_with_a_security_impact
+ # ------------------------------------------------------------------------------
+ # $GL_ALL_READ_ALL = 0;
+ $GIT_PATH="";
$GL_GITCONFIG_KEYS = "";
-
- # The second choice is to give it a space separated list of settings you
- # consider safe. (These are actually treated as a set of regular expression
- # patterns, and any one of them must match). For example:
- # $GL_GITCONFIG_KEYS = "core\.logAllRefUpdates core\..*compression";
- # allows repo admins to set one of those 3 config keys (yes, that second
- # pattern matches two settings from "man git-config", if you look)
- #
- # The third choice (which you may have guessed already if you're familiar with
- # regular expressions) is to allow anything and everything:
- # $GL_GITCONFIG_KEYS = ".*";
-
- # NOTE that due to some quoting and interpolation issues I have not been able
- # to look at, a literal "." needs to be specified in this string as \\. (two
- # backslashes and a dot). So this is how you'd allow any keys in the "foo"
- # category:
- # $GL_GITCONFIG_KEYS = "foo\\..*";
-
- # --------------------------------------
- # ALLOW GITCONFIG KEYS EVEN FOR WILD REPOS
- #
- # This is an efficiency issue more than a security issue, since this requires
- # trawling through all of $REPO_BASE looking for stuff :)
-
# $GL_GITCONFIG_WILD = 0;
-
- # --------------------------------------
- # EXTERNAL COMMAND HELPER -- HTPASSWD
-
- # security note: runs an external command (htpasswd) with specific arguments,
- # including a user-chosen "password".
-
- # if you want to enable the "htpasswd" command, give this the absolute path to
- # whatever file apache (etc) expect to find the passwords in.
-
+ $GL_NO_CREATE_REPOS = 0;
+ $GL_NO_SETUP_AUTHKEYS = 0;
+ # $GL_WILDREPOS_DEFPERMS = 'R @all';
$HTPASSWD_FILE = "";
-
- # Look in doc/3 ("easier to link gitweb authorisation with gitolite" section)
- # for more details on using this feature.
-
- # --------------------------------------
- # EXTERNAL COMMAND HELPER -- RSYNC
-
- # security note: runs an external command (rsync) with specific arguments, all
- # presumably filled in correctly by the client-side rsync.
-
- # base path of all the files that are accessible via rsync. Must be an
- # absolute path. Leave it undefined or set to the empty string to disable the
- # rsync helper.
-
$RSYNC_BASE = "";
-
- # $RSYNC_BASE = "/home/git/up-down";
- # $RSYNC_BASE = "/tmp/up-down";
-
- # --------------------------------------
- # EXTERNAL COMMAND HELPER -- SVNSERVE
-
- # security note: runs an external command (svnserve) with specific arguments,
- # as specified below. %u is substituted with the username.
-
- # This setting allows launching svnserve when requested by the ssh client.
- # This allows using the same SSH setup (hostname/username/public key) for both
- # SVN and git access. Leave it undefined or set to the empty string to disable
- # svnserve access.
-
$SVNSERVE = "";
- # $SVNSERVE = "/usr/bin/svnserve -r /var/svn/ -t --tunnel-user=%u";
-
- # --------------------------------------
- # ALLOW REPO CONFIG TO USE WILDCARDS
-
- # security note: this used to in a separate "wildrepos" branch. You can
- # create repositories based on wild cards, give "ownership" to the specific
- # user who created it, allow him/her to hand out R and RW permissions to other
- # users to collaborate, etc. This is powerful stuff, and I've made it as
- # secure as I can, but it hasn't had the kind of rigorous line-by-line
- # analysis that the old "master" branch had.
-
- # This has now been rolled into master, with all the functionality gated by
- # this variable. Set this to 1 if you want to enable the wildrepos features.
- # Please see doc/wildcard-repositories.mkd for details.
-
- $GL_WILDREPOS = 0;
-
- # --------------------------------------
- # DEFAULT WILDCARD PERMISSIONS
-
- # If set, this value will be used as the default user-level permission rule of
- # new wildcard repositories. The user can change this value with the setperms command
- # as desired after repository creation; it is only a default. Note that @all can be
- # used here but is special; no other groups can be used in user-level permissions.
-
- # $GL_WILDREPOS_DEFPERMS = 'R @all';
-
- # --------------------------------------
- # WILDREPOS PERMS CATEGORIES
-
- # Originally, we only allowed "R" and "RW" in the setperms command. Now we
- # allow the admin to define other categories as she wishes (example: MANAGERS,
- # TESTERS, etc).
-
- # This variable is a space-sep list of the allowed categories.
-
- # PLEASE, *PLEASE*, read the section in doc/wildcard-repositories.mkd for
- # caveats and warnings. This is a VERY powerful feature and if you're not
- # careful you could mess up the ACLs nicely.
-
- # this is the internal default if you don't set it (like if you didn't update
- # your ~/.gitolite.rc with new variables when you upgraded gitolite):
- $GL_WILDREPOS_PERM_CATS = "READERS WRITERS";
-
- # you can use your own categories in addition to the standard ones; I suggest
- # you include READERS and WRITERS for backward compat though:
- # $GL_WILDREPOS_PERM_CATS = "READERS WRITERS MANAGERS";
- # $GL_WILDREPOS_PERM_CATS = "READERS WRITERS MANAGERS TESTERS";
-
- # --------------------------------------
- # HOOK CHAINING
-
- # by default, the update hook in every repo chains to "update.secondary".
- # Similarly, the post-update hook in the admin repo chains to
- # "post-update.secondary". If you're fine with the defaults, there's no need
- # to do anything here. However, if you want to use different names or paths,
- # change these variables
-
# $UPDATE_CHAINS_TO = "hooks/update.secondary";
# $ADMIN_POST_UPDATE_CHAINS_TO = "hooks/post-update.secondary";
-
- # --------------------------------------
- # ADMIN DEFINED COMMANDS
-
- # WARNING: Use this feature only if (a) you really really know what you're
- # doing or (b) you really don't care too much about security. Please read
- # doc/admin-defined-commands.mkd for details.
-
# $GL_ADC_PATH = "";
+ # $GL_GET_MEMBERSHIPS_PGM = "/usr/local/bin/expand-ldap-user-to-groups"
- # --------------------------------------
- # SITE-SPECIFIC INFORMATION
-
- # Some installations would like to give their users customised information
- # (like a link to their own websites, for example) so that each end user does
- # not have to grok all the gitolite documentation.
-
- # If this variable is defined, the "info" command will print it at the end of
- # the listing.
+ # ------------------------------------------------------------------------------
+ # less used/changed variables
+ # ------------------------------------------------------------------------------
+ # $GL_ALL_INCLUDES_SPECIAL = 0;
+ # $GL_SLAVE_MODE = 0;
+ # $ENV{GL_SLAVES} = 'gitolite@server2 gitolite@server3';
+ # PLEASE USE SINGLE QUOTES ABOVE, NOT DOUBLE QUOTES
+ $GL_WILDREPOS_PERM_CATS = "READERS WRITERS";
- # $GL_SITE_INFO = "";
+ # ------------------------------------------------------------------------------
+ # rarely changed variables
+ # ------------------------------------------------------------------------------
+ $GL_LOGT="$GL_ADMINDIR/logs/gitolite-%y-%m.log";
+ # $GL_PERFLOGT="$GL_ADMINDIR/logs/perf-gitolite-%y-%m.log";
# $GL_SITE_INFO = "XYZ.COM DEVELOPERS: PLEASE SEE http://xyz.com/gitolite/help first";
- # --------------------------------------
- # USERGROUP HANDLING
-
- # Some sites would like to store group membership outside gitolite, because
- # they already have it in (usually) their LDAP server, and it doesn't make
- # sense to be forced to duplicate this information.
-
- # Set the following variable to the name of a script that, given a username as
- # argument, will return a list of groups that she is a member of.
-
- # $GL_GET_MEMBERSHIPS_PGM = "/usr/local/bin/expand-ldap-user-to-groups"
+ # ------------------------------------------------------------------------------
+ # variables that should NOT be changed after the install step completes
+ # ------------------------------------------------------------------------------
+ $REPO_BASE="repositories";
- # --------------------------------------
+ # ------------------------------------------------------------------------------
# per perl rules, this should be the last line in such a file:
1;
diff --cc src/gitolite.pm
index 7a36858,64bab29..83bf535
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -43,12 -43,17 +43,17 @@@ our $REPOPATT_PATT=qr(^\@?[0-9a-zA-Z[][
our $ADC_CMD_ARGS_PATT=qr(^[0-9a-zA-Z._\@/+:-]*$);
# these come from the RC file
-our ($REPO_UMASK, $GL_WILDREPOS, $GL_PACKAGE_CONF, $GL_PACKAGE_HOOKS, $REPO_BASE, $GL_CONF_COMPILED, $GL_BIG_CONFIG, $GL_PERFLOGT, $PROJECTS_LIST, $GL_ALL_INCLUDES_SPECIAL, $GL_SITE_INFO, $GL_GET_MEMBERSHIPS_PGM, $GL_WILDREPOS_PERM_CATS, $GL_KEYDIR, @GL_METADATA);
+our ($REPO_UMASK, $GL_WILDREPOS, $GL_PACKAGE_CONF, $GL_PACKAGE_HOOKS, $REPO_BASE, $GL_CONF_COMPILED, $GL_BIG_CONFIG, $GL_PERFLOGT, $PROJECTS_LIST, $GL_ALL_INCLUDES_SPECIAL, $GL_SITE_INFO, $GL_GET_MEMBERSHIPS_PGM, $GL_WILDREPOS_PERM_CATS, $GL_KEYDIR, @GL_METADATA, @GL_METADATA_REQUIRED);
our %repos;
our %groups;
- our %repo_config;
+ our %git_configs;
+ our %split_conf;;
our $data_version;
- our $current_data_version = '1.6';
+ our $current_data_version = '1.7';
+
+ # the following are read in from individual repo's gl-conf files, if present
+ our %one_repo;
+ our %one_git_config;
# ----------------------------------------------------------------------------
# convenience subs
diff --cc src/gl-auth-command
index dffdb62,1af4232..9bfca63
--- a/src/gl-auth-command
+++ b/src/gl-auth-command
@@@ -32,7 -32,7 +32,7 @@@ use warnings
# ----------------------------------------------------------------------------
# these are set by the "rc" file
- our ($GL_LOGT, $GL_CONF_COMPILED, $REPO_BASE, $GIT_PATH, $REPO_UMASK, $GL_ADMINDIR, $RSYNC_BASE, $HTPASSWD_FILE, $GL_WILDREPOS, $GL_WILDREPOS_DEFPERMS, $GL_ADC_PATH, $SVNSERVE, $PROJECTS_LIST, $GL_SLAVE_MODE, $GL_PERFLOGT, @GL_METADATA);
-our ($GL_LOGT, $GL_CONF_COMPILED, $REPO_BASE, $GIT_PATH, $REPO_UMASK, $GL_ADMINDIR, $RSYNC_BASE, $HTPASSWD_FILE, $GL_WILDREPOS, $GL_WILDREPOS_DEFPERMS, $GL_ADC_PATH, $SVNSERVE, $PROJECTS_LIST, $GL_SLAVE_MODE, $GL_PERFLOGT, $GL_ALL_READ_ALL);
++our ($GL_LOGT, $GL_CONF_COMPILED, $REPO_BASE, $GIT_PATH, $REPO_UMASK, $GL_ADMINDIR, $RSYNC_BASE, $HTPASSWD_FILE, $GL_WILDREPOS, $GL_WILDREPOS_DEFPERMS, $GL_ADC_PATH, $SVNSERVE, $PROJECTS_LIST, $GL_SLAVE_MODE, $GL_PERFLOGT, $GL_ALL_READ_ALL, @GL_METADATA);
# and these are set by gitolite.pm
our ($R_COMMANDS, $W_COMMANDS, $REPONAME_PATT, $REPOPATT_PATT, $ADC_CMD_ARGS_PATT);
our %repos;
^ permalink raw reply [flat|nested] 30+ messages in thread* [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata commit in: /
@ 2011-02-15 16:42 Christian Ruppert
0 siblings, 0 replies; 30+ messages in thread
From: Christian Ruppert @ 2011-02-15 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 56315f2ed48b5dfabcdf774d87f9eb3905fa146f
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 16:29:16 2011 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 16:29:16 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=56315f2e
Merge branch 't/find_pubkeys-function' into refs/top-bases/t/ssh-key-options
.topdeps | 2 +-
conf/example.conf | 3 -
conf/example.gitolite.rc | 329 +++-----------------
contrib/adc/get-rights-and-owner.in-perl | 41 +++
contrib/ldap/README.mkd | 18 ++
contrib/ldap/ldap-query-example.pl | 80 +++++
contrib/ldap/ldap-query-example.sh | 68 +++++
contrib/ldap/passwd | 112 +++++++
doc/CHANGELOG | 22 ++
doc/big-config.mkd | 229 ++++++++++----
doc/delegation.mkd | 2 +-
doc/gitolite.rc.mkd | 332 +++++++++++++++++++++
doc/install-transcript.mkd | 2 +-
doc/overkill.mkd | 8 +-
doc/progit-article.mkd | 2 +-
doc/ssh-troubleshooting.mkd | 2 +-
doc/who-uses-it.mkd | 5 +
src/gitolite.pm | 124 +++++----
src/gl-auth-command | 14 +-
src/gl-compile-conf | 164 +++++++----
t/out/t01-repo-groups.1 | 2 +-
t/out/t01-repo-groups.1b | 2 +-
t/out/{t01-repo-groups.1b => t01-repo-groups.1bs} | 33 ++-
t/out/t01-repo-groups.2 | 28 ++-
t/out/t02-user-groups.1 | 2 +-
t/out/t02-user-groups.1b | 2 +-
t/out/{t02-user-groups.1b => t02-user-groups.1bs} | 35 +--
t/out/t02-user-groups.2 | 2 +-
t/out/{t02-user-groups.2 => t02-user-groups.2bs} | 49 ++--
t/t01-repo-groups | 6 +-
t/t02-user-groups | 8 +-
t/t59-repo-not-on-disk | 12 +-
t/test-driver.sh | 7 +
33 files changed, 1196 insertions(+), 551 deletions(-)
^ permalink raw reply [flat|nested] 30+ messages in thread
end of thread, other threads:[~2011-03-28 15:19 UTC | newest]
Thread overview: 30+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-25 20:00 [gentoo-commits] proj/gitolite-gentoo:t/ssh-key-options commit in: / Christian Ruppert
2011-03-25 19:59 ` [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
-- strict thread matches above, loose matches on Subject: below --
2011-03-28 15:19 Christian Ruppert
2011-03-28 15:19 Christian Ruppert
2011-03-25 20:00 [gentoo-commits] proj/gitolite-gentoo:t/ssh-key-options " Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
2011-03-25 20:00 Christian Ruppert
2011-03-25 20:00 Christian Ruppert
2011-03-25 19:59 [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
2011-03-25 19:59 [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
2011-03-25 19:59 [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
2011-03-25 19:59 [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
2011-03-25 19:59 [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
2011-03-25 19:59 [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
2011-03-25 19:59 [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
2011-03-25 19:59 [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-03-25 20:00 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
2011-02-16 16:07 [gentoo-commits] proj/gitolite-gentoo:t/find_pubkeys-function " Christian Ruppert
2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
2011-02-16 16:07 [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function " Christian Ruppert
2011-02-16 16:07 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
2011-02-16 16:07 Christian Ruppert
2011-02-16 16:07 Christian Ruppert
2011-02-16 16:07 Christian Ruppert
2011-02-16 16:07 Christian Ruppert
2011-02-16 16:07 [gentoo-commits] proj/gitolite-gentoo:master " Christian Ruppert
2011-02-15 16:42 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
2011-02-15 16:42 [gentoo-commits] proj/gitolite-gentoo:t/find_pubkeys-function " Christian Ruppert
2011-02-15 16:42 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
2011-02-15 16:42 [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function " Christian Ruppert
2011-02-15 16:42 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
2011-02-15 16:42 [gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function " Christian Ruppert
2011-02-15 16:42 ` [gentoo-commits] proj/gitolite-gentoo:t/export-key-metadata " Christian Ruppert
2011-02-15 16:42 Christian Ruppert
2011-02-15 16:42 Christian Ruppert
2011-02-15 16:42 Christian Ruppert
2011-02-15 16:42 Christian Ruppert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox