Index: head/devel/gitlab-shell/Makefile =================================================================== --- head/devel/gitlab-shell/Makefile (revision 424244) +++ head/devel/gitlab-shell/Makefile (revision 424245) @@ -1,32 +1,32 @@ # Created by: Torsten Zuehlsdorff Index: head/devel/gitlab-shell/distinfo =================================================================== --- head/devel/gitlab-shell/distinfo (revision 424244) +++ head/devel/gitlab-shell/distinfo (revision 424245) @@ -1,3 +1,3 @@ -TIMESTAMP = 1468920011 -SHA256 (gitlab-shell-v3.0.0.tar.gz) = b57561ce84f108fd99aa7e152dc129ec9e0348063ce4fa7b796a2ebfcafdba75 -SIZE (gitlab-shell-v3.0.0.tar.gz) = 68128 +TIMESTAMP = 1470988234 +SHA256 (gitlab-shell-v3.2.1.tar.gz) = ad21f8676901b9d90a1c8016b5fe2ad73f9a7966ab378ce244b12fc0373e9f46 +SIZE (gitlab-shell-v3.2.1.tar.gz) = 68788 Index: head/devel/gitlab-shell/files/patch-config.yml.example =================================================================== --- head/devel/gitlab-shell/files/patch-config.yml.example (revision 424244) +++ head/devel/gitlab-shell/files/patch-config.yml.example (revision 424245) @@ -1,20 +1,11 @@ ---- config.yml.example.orig 2016-04-07 14:39:29 UTC +--- config.yml.example.orig 2016-07-26 21:04:16 UTC +++ config.yml.example -@@ -28,7 +28,7 @@ http_settings: - # Give the canonicalized absolute pathname, - # REPOS_PATH MUST NOT CONTAIN ANY SYMLINK!!! - # Check twice that none of the components is a symlink, including "/home". --repos_path: "/home/git/repositories" -+repos_path: "/usr/home/git/repositories" - - # File used as authorized_keys for gitlab user - auth_file: "/home/git/.ssh/authorized_keys" -@@ -49,7 +49,7 @@ redis: +@@ -43,7 +43,7 @@ redis: # Log file. # Default is gitlab-shell.log in the root directory. -# log_file: "/home/git/gitlab-shell/gitlab-shell.log" +log_file: "/var/log/gitlab-shell/gitlab-shell.log" # Log level. INFO by default log_level: INFO Index: head/devel/gitlab-shell/pkg-plist =================================================================== --- head/devel/gitlab-shell/pkg-plist (revision 424244) +++ head/devel/gitlab-shell/pkg-plist (revision 424245) @@ -1,78 +1,80 @@ %%DATADIR%%/.gitignore %%DATADIR%%/.gitlab-ci.yml -%%DATADIR%%/.hound.yml %%DATADIR%%/.rspec %%DATADIR%%/.rubocop.yml %%DATADIR%%/CHANGELOG %%DATADIR%%/Gemfile %%DATADIR%%/Gemfile.lock %%DATADIR%%/Guardfile %%DATADIR%%/LICENSE %%DATADIR%%/Makefile %%DATADIR%%/README.md %%DATADIR%%/VERSION @(,,555) %%DATADIR%%/bin/authorized_keys @(,,555) %%DATADIR%%/bin/check @(,,555) %%DATADIR%%/bin/create-hooks @(,,555) %%DATADIR%%/bin/gitlab-keys @(,,555) %%DATADIR%%/bin/gitlab-projects @(,,555) %%DATADIR%%/bin/gitlab-shell @(,,555) %%DATADIR%%/bin/install @sample %%DATADIR%%/config.yml.sample @(,,555) %%DATADIR%%/hooks/post-receive @(,,555) %%DATADIR%%/hooks/pre-receive @(,,555) %%DATADIR%%/hooks/update %%DATADIR%%/lib/gitlab_access.rb %%DATADIR%%/lib/gitlab_access_status.rb %%DATADIR%%/lib/gitlab_authorized_keys.rb %%DATADIR%%/lib/gitlab_config.rb %%DATADIR%%/lib/gitlab_custom_hook.rb %%DATADIR%%/lib/gitlab_init.rb %%DATADIR%%/lib/gitlab_keys.rb %%DATADIR%%/lib/gitlab_logger.rb %%DATADIR%%/lib/gitlab_net.rb %%DATADIR%%/lib/gitlab_post_receive.rb %%DATADIR%%/lib/gitlab_projects.rb +%%DATADIR%%/lib/gitlab_redis.rb %%DATADIR%%/lib/gitlab_shell.rb %%DATADIR%%/lib/httpunix.rb %%DATADIR%%/lib/names_helper.rb %%DATADIR%%/lib/vendor/redis/lib/redis.rb %%DATADIR%%/lib/vendor/redis/lib/redis/client.rb %%DATADIR%%/lib/vendor/redis/lib/redis/connection.rb %%DATADIR%%/lib/vendor/redis/lib/redis/connection/command_helper.rb %%DATADIR%%/lib/vendor/redis/lib/redis/connection/hiredis.rb %%DATADIR%%/lib/vendor/redis/lib/redis/connection/registry.rb %%DATADIR%%/lib/vendor/redis/lib/redis/connection/ruby.rb %%DATADIR%%/lib/vendor/redis/lib/redis/connection/synchrony.rb %%DATADIR%%/lib/vendor/redis/lib/redis/distributed.rb %%DATADIR%%/lib/vendor/redis/lib/redis/errors.rb %%DATADIR%%/lib/vendor/redis/lib/redis/hash_ring.rb %%DATADIR%%/lib/vendor/redis/lib/redis/pipeline.rb %%DATADIR%%/lib/vendor/redis/lib/redis/subscribe.rb %%DATADIR%%/lib/vendor/redis/lib/redis/version.rb %%DATADIR%%/spec/gitlab_access_spec.rb %%DATADIR%%/spec/gitlab_config_spec.rb %%DATADIR%%/spec/gitlab_keys_spec.rb %%DATADIR%%/spec/gitlab_logger_spec.rb %%DATADIR%%/spec/gitlab_net_spec.rb %%DATADIR%%/spec/gitlab_post_receive_spec.rb %%DATADIR%%/spec/gitlab_projects_spec.rb %%DATADIR%%/spec/gitlab_shell_spec.rb %%DATADIR%%/spec/httpunix_spec.rb %%DATADIR%%/spec/names_helper_spec.rb %%DATADIR%%/spec/spec_helper.rb %%DATADIR%%/spec/vcr_cassettes/allowed-pull.yml %%DATADIR%%/spec/vcr_cassettes/allowed-push.yml %%DATADIR%%/spec/vcr_cassettes/broadcast_message-none.yml %%DATADIR%%/spec/vcr_cassettes/broadcast_message-ok.yml %%DATADIR%%/spec/vcr_cassettes/check-ok.yml %%DATADIR%%/spec/vcr_cassettes/denied-pull.yml %%DATADIR%%/spec/vcr_cassettes/denied-push-with-user.yml %%DATADIR%%/spec/vcr_cassettes/denied-push.yml %%DATADIR%%/spec/vcr_cassettes/discover-ok.yml +%%DATADIR%%/spec/vcr_cassettes/http-access-disabled.yml +%%DATADIR%%/spec/vcr_cassettes/ssh-access-disabled.yml %%DATADIR%%/spec/vcr_cassettes/ssh-key-not-found.yml %%DATADIR%%/spec/vcr_cassettes/ssh-key-not-implemented.yml %%DATADIR%%/spec/vcr_cassettes/ssh-key-ok.yml %%DATADIR%%/support/rewrite-hooks.sh %%DATADIR%%/support/truncate_repositories.sh @dir(git,,755) /var/log/gitlab-shell