|
54 | 54 | 'user' => 'git',
|
55 | 55 | 'user_home' => '/home/git',
|
56 | 56 | 'repository' => 'https://gitlab.com/gitlab-org/gitlab-shell.git',
|
57 |
| - 'revision' => 'v1.9.6', |
| 57 | + 'revision' => 'v2.0.0', |
58 | 58 | 'repository_dir' => '/home/git/repositories',
|
59 | 59 | 'auth_file' => '/home/git/.ssh/authorized_keys',
|
60 | 60 | 'selfsigned_certs' => true,
|
|
73 | 73 | it { should contain_class('gitlab::install').with(
|
74 | 74 | 'app_dir' => '/home/git/gitlab',
|
75 | 75 | 'repository' => 'https://gitlab.com/gitlab-org/gitlab-ce.git',
|
76 |
| - 'revision' => '7-1-stable', |
| 76 | + 'revision' => '7-3-stable', |
77 | 77 | 'user' => 'git'
|
78 | 78 | ) }
|
79 | 79 | it { should contain_file('gitlab_app_config').with(
|
|
167 | 167 | {'error_code' => '503', 'document' => '/deploy.html'}
|
168 | 168 | ],
|
169 | 169 | 'error_log_file' => 'gitlab.test.example.org.log',
|
170 |
| - 'custom_fragment' => " CustomLog /var/log/apache2/gitlab_test.example.org_forwarded.log common_forwarded\n CustomLog /var/log/apache2/gitlab_test.example.org_access.log combined env=!dontlog\n CustomLog /var/log/apache2/gitlab_test.example.org.log combined", |
| 170 | + 'custom_fragment' => " CustomLog /var/log/apache2/gitlab_test.example.org_forwarded.log common_forwarded\n CustomLog /var/log/apache2/gitlab_test.example.org_access.log combined env=!dontlog\n CustomLog /var/log/apache2/gitlab_test.example.org.log combined\n AllowEncodedSlashes NoDecode", |
171 | 171 | 'require' => ['Ruby::Rake[gitlab_precompile_assets]','Service[gitlab]']
|
172 | 172 | ) }
|
173 | 173 | # Verify contents of gitlab_app_config
|
|
527 | 527 | 'servername' => 'git.somewhere.org',
|
528 | 528 | 'docroot' => '/home/git/gitlab/public',
|
529 | 529 | 'serveradmin' => 'admin@somewhere.org',
|
| 530 | + 'docroot_owner' => 'git', |
| 531 | + 'docroot_group' => 'git', |
530 | 532 | 'port' => '80',
|
531 | 533 | 'directories' => {},
|
532 | 534 | 'rewrites' => [
|
|
560 | 562 | {'error_code' => '503', 'document' => '/deploy.html'}
|
561 | 563 | ],
|
562 | 564 | 'error_log_file' => 'gitlab.git.somewhere.org.log',
|
563 |
| - 'custom_fragment' => " CustomLog /var/log/apache2/gitlab_git.somewhere.org_forwarded.log common_forwarded\n CustomLog /var/log/apache2/gitlab_git.somewhere.org_access.log combined env=!dontlog\n CustomLog /var/log/apache2/gitlab_git.somewhere.org.log combined", |
| 565 | + 'custom_fragment' => " CustomLog /var/log/apache2/gitlab_git.somewhere.org_forwarded.log common_forwarded\n CustomLog /var/log/apache2/gitlab_git.somewhere.org_access.log combined env=!dontlog\n CustomLog /var/log/apache2/gitlab_git.somewhere.org.log combined\n AllowEncodedSlashes NoDecode", |
564 | 566 | 'require' => ['Ruby::Rake[gitlab_precompile_assets]','Service[gitlab]']
|
565 | 567 | ) }
|
566 | 568 | it { should contain_file('gitlab_app_config').with_content(
|
|
653 | 655 | describe 'when setting GitHub as an OmniAuth provider' do
|
654 | 656 | let :params do
|
655 | 657 | {
|
| 658 | + :enable_https => true, |
656 | 659 | :omniauth => [
|
657 | 660 | { 'provider' => 'github',
|
658 | 661 | 'app_id' => 'YOURIDHERE',
|
|
680 | 683 | describe 'when setting Twitter as an OmniAuth provider' do
|
681 | 684 | let :params do
|
682 | 685 | {
|
| 686 | + :enable_https => true, |
683 | 687 | :omniauth => [
|
684 | 688 | { 'provider' => 'twitter',
|
685 | 689 | 'app_id' => 'YOURIDHERE',
|
|
704 | 708 | describe 'when setting Google as an OmniAuth provider' do
|
705 | 709 | let :params do
|
706 | 710 | {
|
| 711 | + :enable_https => true, |
707 | 712 | :omniauth => [
|
708 | 713 | { 'provider' => 'google',
|
709 | 714 | 'app_id' => 'YOURIDHERE',
|
|
731 | 736 | describe 'when setting multiple OmniAuth providers' do
|
732 | 737 | let :params do
|
733 | 738 | {
|
| 739 | + :enable_https => true, |
734 | 740 | :omniauth => [
|
735 | 741 | { 'provider' => 'google',
|
736 | 742 | 'app_id' => 'YOURGOOGLEIDHERE',
|
|
0 commit comments