diff options
-rw-r--r-- | databases.morph | 3 | ||||
-rw-r--r-- | gitlab-ci-runner/usr/share/gitlab-install/systemd-units/gitlab-ci-runner.service | 4 | ||||
-rw-r--r-- | gitlab-server.morph | 1 | ||||
-rw-r--r-- | gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-ci-unicorn.service | 4 | ||||
-rw-r--r-- | gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-unicorn.service | 4 | ||||
-rwxr-xr-x | gitlab-server/usr/share/gitlab-setup | 8 | ||||
-rw-r--r-- | gitlab.morph | 21 | ||||
-rw-r--r-- | ruby.morph | 8 |
8 files changed, 41 insertions, 12 deletions
diff --git a/databases.morph b/databases.morph index 628fcf30..c824b9b1 100644 --- a/databases.morph +++ b/databases.morph @@ -18,7 +18,8 @@ chunks: - readline - name: redis repo: upstream:redis - ref: baserock/3.0 + ref: 9ee59fca9c5c429185d35779c2d5db64005091b0 + unpetrify-ref: baserock/3.0 build-depends: [] - name: memcached repo: upstream:memcached diff --git a/gitlab-ci-runner/usr/share/gitlab-install/systemd-units/gitlab-ci-runner.service b/gitlab-ci-runner/usr/share/gitlab-install/systemd-units/gitlab-ci-runner.service index 7e7c12b9..dfc84d96 100644 --- a/gitlab-ci-runner/usr/share/gitlab-install/systemd-units/gitlab-ci-runner.service +++ b/gitlab-ci-runner/usr/share/gitlab-install/systemd-units/gitlab-ci-runner.service @@ -7,8 +7,8 @@ WorkingDirectory=/root/gitlab-ci-runner SyslogIdentifier=gitlab-ci-runner ExecStart=/usr/bin/bundle exec "./bin/runner" -ExecStop=/usr/bin/kill -QUIT $MAINPID -ExecReload=/usr/bin/kill -USR2 $MAINPID +ExecStop=/bin/kill -s QUIT $MAINPID +ExecReload=/bin/kill -s USR2 $MAINPID [Install] WantedBy=multi-user.target diff --git a/gitlab-server.morph b/gitlab-server.morph index e0210f6e..6142b8c6 100644 --- a/gitlab-server.morph +++ b/gitlab-server.morph @@ -19,3 +19,4 @@ strata: - morph: databases - morph: webtools - morph: ruby +- morph: gitlab diff --git a/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-ci-unicorn.service b/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-ci-unicorn.service index 811b3fc0..151f9677 100644 --- a/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-ci-unicorn.service +++ b/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-ci-unicorn.service @@ -17,8 +17,8 @@ SyslogIdentifier=gitlab-ci-unicorn PIDFile=/home/gitlab_ci/gitlab-ci/tmp/pids/unicorn.pid ExecStart=/usr/bin/bundle exec "unicorn_rails -c /home/gitlab_ci/gitlab-ci/config/unicorn.rb -E production" -ExecStop=/usr/bin/kill -QUIT $MAINPID -ExecReload=/usr/bin/kill -USR2 $MAINPID +ExecStop=/bin/kill -s QUIT $MAINPID +ExecReload=/bin/kill -s USR2 $MAINPID [Install] WantedBy=gitlab.target diff --git a/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-unicorn.service b/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-unicorn.service index 71e3d84d..a901d323 100644 --- a/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-unicorn.service +++ b/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-unicorn.service @@ -17,8 +17,8 @@ SyslogIdentifier=gitlab-unicorn PIDFile=/home/git/gitlab/tmp/pids/unicorn.pid ExecStart=/usr/bin/bundle exec "unicorn_rails -c /home/git/gitlab/config/unicorn.rb -E production" -ExecStop=/usr/bin/kill -QUIT $MAINPID -ExecReload=/usr/bin/kill -USR2 $MAINPID +ExecStop=/bin/kill -s QUIT $MAINPID +ExecReload=/bin/kill -s USR2 $MAINPID [Install] WantedBy=gitlab.target diff --git a/gitlab-server/usr/share/gitlab-setup b/gitlab-server/usr/share/gitlab-setup index e1084a1b..e60dfcdf 100755 --- a/gitlab-server/usr/share/gitlab-setup +++ b/gitlab-server/usr/share/gitlab-setup @@ -21,7 +21,7 @@ set -e gem install bundler # create required users -adduser -D --gecos 'GitLab' -s /bin/sh git +if [ `grep -c '^git:' /etc/passwd` -ne 1 ] ; then adduser -D --gecos 'GitLab' -s /bin/sh git ; fi adduser -D -s /bin/sh postgres adduser -D --gecos 'GitLab CI' -s /bin/sh gitlab_ci @@ -49,13 +49,13 @@ su -c "git config --global user.email 'gitlab@localhost'" - git su -c "git config --global core.autocrlf input" - git # install gitlab shell -su -c "git clone https://gitlab.com/gitlab-org/gitlab-shell.git -b v1.9.3 ~/gitlab-shell" - git +su -c "cp -r /usr/share/gitlab-shell gitlab-shell" - git cd /home/git/gitlab-shell cp /usr/share/gitlab-install/gitlab-shell/config.yml ./config.yml su -c "~/gitlab-shell/bin/install" - git # install gitlab -su -c "git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 6-8-stable ~/gitlab" - git +su -c "cp -r /usr/share/gitlab-ce gitlab" - git cd /home/git/gitlab su -c "cp config/database.yml.postgresql config/database.yml" git su -c "cp -r /usr/share/gitlab-install/gitlab/config/* config/" git @@ -76,7 +76,7 @@ su -c "git config --global user.email 'gitlab_ci@localhost'" - gitlab_ci su -c "git config --global core.autocrlf input" - gitlab_ci # install gitlab ci -su -c "git clone https://gitlab.com/gitlab-org/gitlab-ci.git -b 5-0-stable" - gitlab_ci +su -c "cp -r /usr/share/gitlab-ci gitlab-ci" - gitlab_ci cd /home/gitlab_ci/gitlab-ci su -c "cp config/database.yml.postgresql config/database.yml" gitlab_ci su -c "cp -r /usr/share/gitlab-install/gitlab-ci/config/* config/" gitlab_ci diff --git a/gitlab.morph b/gitlab.morph new file mode 100644 index 00000000..a731290a --- /dev/null +++ b/gitlab.morph @@ -0,0 +1,21 @@ +name: gitlab +kind: stratum +description: gitlab components for server, ci etc +build-depends: +- morph: ruby +chunks: +- name: gitlab-ce + repo: upstream:gitlab/gitlab-ce + ref: cdec1324173c2331153b671ef6ebab749bca9cd4 + unpetrify-ref: baserock/morph + build-depends: [] +- name: gitlab-ci + repo: upstream:gitlab/gitlab-ci + ref: c74044d65dec2ba8311e242c84e07a67abd52d37 + unpetrify-ref: baserock/morph + build-depends: [] +- name: gitlab-shell + repo: upstream:gitlab/gitlab-shell + ref: 0b4106d57223c666d9360339fd3790174aa43800 + unpetrify-ref: baserock/morph + build-depends: [] @@ -1,4 +1,4 @@ -name: ruby +name: ruby kind: stratum description: ruby and things from ruby world build-depends: @@ -21,3 +21,9 @@ chunks: build-depends: - ruby-1.8 - libyaml +- name: bundler + repo: upstream:bundler + ref: 0708fbe62617a63300e1cc3b9869cc1280c57ef6 + unpetrify_ref: baserock/v1.6.2 + build-depends: + - ruby |