Merge lp:~patrick-hetu/charms/precise/gitlab/6-8-stable into lp:charms/gitlab

[Patrick Hetu]

Update the charm to install version 6-8-stable.

[Benjamin Saller (bcsaller)]

Thank you so much for the submission! I am going to put this MP to "Needs Fixing"

Once the problem has been addressed, click on the “Request another review” link on this merge proposal. That way it will be added to the review queue properly.

If you have any questions/comments/concerns about the review contact us in #juju on irc.freenode.net or email the mailing list <email address hidden>

The notes below are pretty minor. I'm also not sure what nesscited the change from gitlab to git everywhere, but implementor's choice :)

review: Needs Fixing

[Marco Ceppi (marcoceppi)]

Hey, there's a new review system we're moving this to Work in progress, when ready for another review please move to "Needs review". If you wish to abandon this please move to Rejected.

Thanks!

Unmerged revisions

8. By Patrick Hetu on 2014-05-09

update to the last version

=== modified file 'config.yaml'
--- config.yaml	2013-02-01 22:47:17 +0000
+++ config.yaml	2014-05-09 15:56:56 +0000
@@ -1,17 +1,17 @@
 options:
   admin_password:
     type: string
-    description: Sets the admin password
+    description: Sets the admin password. MANDATORY.
 
   host:
     type: string
-    description: The FQDN for your GitLab unit
+    description: The FQDN for your GitLab unit. MANDATORY.
     default: localhost
 
   email_from:
     type: string
     description: Email address used in the from field in mails send by GitLab
-    default: gitlab@localhost
+    default: git@localhost
 
   support_email:
     type: string

=== modified file 'hooks/db-relation-broken'
--- hooks/db-relation-broken	2013-02-01 22:47:17 +0000
+++ hooks/db-relation-broken	2014-05-09 15:56:56 +0000
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo -u gitlab -H rm -f ~gitlab/gitlab/config/database.yml
+sudo -u gitlab -H rm -f ~git/gitlab/config/database.yml

=== modified file 'hooks/db-relation-changed'
--- hooks/db-relation-changed	2013-02-01 22:47:17 +0000
+++ hooks/db-relation-changed	2014-05-09 15:56:56 +0000
@@ -13,9 +13,9 @@
 source inc/common
 
 # If there is a config file already, Joomla is already installed & config'ed
-if [ -f ~gitlab/gitlab/config/database.yml ]; then
+if [ -f ~git/gitlab/config/database.yml ]; then
 	juju-log "Database relation is already setup. Nothing to be done"
-	# TODO: Update the config file with new DB values even 
+	# TODO: Update the config file with new DB values even
 	exit 0
 fi
 
@@ -28,14 +28,14 @@
 # Admin password from config.yaml
 admin_password=`config-get admin_password`
 
-# Secret key 
+# Secret key
 secret_key=`pwgen 32 1`
 
 # Sanity checks
 ## If there is no database name defined, die
 if [ -z "$database" ] ; then
     juju-log "Not a valid database"
-    exit 1
+    exit 0
 fi
 
 ## If the user has given no password to the admin user exit with an error
@@ -48,43 +48,49 @@
 function configure_mysql_database() {
 	# Generates the proper database config
 	juju-log Configuring MySQL GitLab database
-	cd ~gitlab/gitlab
-	sudo -u gitlab -H sh -c "sed -e 's/^  database: gitlabhq_production/  database: $database/g' < config/database.yml.mysql > config/database.yml"
-	sudo -u gitlab -H sh -c "sed -i -e 's/^  username: root/  username: $user/g' config/database.yml"
-	sudo -u gitlab -H sh -c "sed -i -e 's/^  password: \"secure password\"/  password: \"$password\"/g' config/database.yml"
-	sudo -u gitlab -H sh -c "sed -i -e 's/^  # host: localhost/  host: $host/g' config/database.yml"
+	cd ~git/gitlab
+	sudo -u git -H sh -c "sed -e 's/^  database: gitlabhq_production/  database: $database/g' < config/database.yml.mysql > config/database.yml"
+	sudo -u git -H sh -c "sed -i -e 's/^  username: git/  username: $user/g' config/database.yml"
+	sudo -u git -H sh -c "sed -i -e 's/^  password: \"secure password\"/  password: \"$password\"/g' config/database.yml"
+	sudo -u git -H sh -c "sed -i -e 's/^  # host: localhost/  host: $host/g' config/database.yml"
 	cd -
 }
 
 function install_mysql_gems() {
-	cd ~gitlab/gitlab
+	cd ~git/gitlab
 
 	# TODO: this gem install is probably better off in the install hook
 	sudo gem install charlock_holmes --version '0.6.9'
 
 	# For MySQL (note, the option says "without")
-	sudo -u gitlab -H bundle install --deployment --without development test postgres
+	sudo -u git -H bundle install --deployment --without development test postgres
 	cd -
 }
 
 function init_database() {
-	cd ~gitlab/gitlab
+	cd ~git/gitlab
 	juju-log "Seting up GitLab and initializing database"
-	sudo -u gitlab -H sh -c "yes yes | bundle exec rake gitlab:setup RAILS_ENV=production"
+	sudo -u git -H sh -c "yes yes | bundle exec rake gitlab:setup RAILS_ENV=production"
 	cd -
 }
 
 function precompile() {
 	# TODO: maybe this can be done during install, but I am not sure if it needs the db connection to
 	# be established already.
-	cd ~gitlab/gitlab
+	cd ~git/gitlab
 	juju-log "Precompiling GitLab. This may take a while (15 minutes on ec2 t1.micro)..."
 	juju-log "Please, be patient"
-	sudo -u gitlab -H bundle exec rake assets:precompile RAILS_ENV=production
+	sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
 	juju-log "Precompile finished. Thanks for your patience"
 	cd -
 }
 
+function install_git_shell() {
+	cd ~git/gitlab-shell/
+    sudo -u git -H cp config.yml.example config.yml
+    sudo -u git -H ./bin/install
+}
+
 function set_admin_password() {
 	encrypted_password=`ruby -e 'require "bcrypt"; puts BCrypt::Password.create(ARGV[0], :cost => 10)' $admin_password`
 	# TODO: allow for email to be config'ed too
@@ -99,9 +105,13 @@
 init_database
 set_admin_password
 precompile
+install_git_shell
 
 juju-log "Opening port 80"
 open-port 80/tcp
 
-juju-log "Starting Nginx and GitLab"
-hooks/start
+juju-log "Starting GitLab"
+sudo service gitlab start
+juju-log "Starting nginx"
+sudo service nginx start
+

=== modified file 'hooks/install'
--- hooks/install	2013-02-01 22:47:17 +0000
+++ hooks/install	2014-05-09 15:56:56 +0000
@@ -58,13 +58,9 @@
   		git
 
 	# This user is for gitlab, a web gui for managing your git repositories
-	sudo adduser --disabled-login --gecos 'GitLab' gitlab 	
 
-	# Add it to the git group
-	sudo usermod -a -G git gitlab
-	
 	# Generate the SSH key
-	sudo -u gitlab -H ssh-keygen -q -N '' -t rsa -f /home/gitlab/.ssh/id_rsa
+	sudo -u git -H ssh-keygen -q -N '' -t rsa -f /home/git/.ssh/id_rsa
 }
 
 function install_gitolite() {
@@ -79,8 +75,8 @@
 	sudo -u git -H sh -c 'gitolite/install -ln /home/git/bin'
 
 	# Copy the gitlab user's (public) SSH key ...
-	sudo cp /home/gitlab/.ssh/id_rsa.pub /home/git/gitlab.pub
-	sudo chmod 0444 /home/git/gitlab.pub	
+	sudo cp /home/git/.ssh/id_rsa.pub /home/git/gitlab.pub
+	sudo chmod 0444 /home/git/gitlab.pub
 
 	# ... and use it as the admin key for the Gitolite setup
 	sudo -u git -H sh -c "PATH=/home/git/bin:$PATH; gitolite setup -pk /home/git/gitlab.pub"
@@ -88,19 +84,19 @@
 	# Make sure the Gitolite config dir is owned by git
 	sudo chmod 750 /home/git/.gitolite/
 	sudo chown -R git:git /home/git/.gitolite/
-	
+
 	# Make sure the repositories dir is owned by git and it stays that way
 	sudo chmod -R ug+rwXs,o-rwx /home/git/repositories/
 	sudo chown -R git:git /home/git/repositories/
 
 	# Adds localhost ssh key to gitlab's known_hosts
-	sudo -u gitlab -H sh -c 'ssh-keyscan -H localhost >> ~/.ssh/known_hosts'
+	sudo -u git -H sh -c 'ssh-keyscan -H localhost >> ~/.ssh/known_hosts'
 }
 
 function test_gitolite() {
 	# Clone the admin repo so SSH adds localhost to known_hosts ...
 	# ... and to be sure your users have access to Gitolite
-	sudo -u gitlab -H git clone git@localhost:gitolite-admin.git /tmp/gitolite-admin
+	sudo -u git -H git clone git@localhost:gitolite-admin.git /tmp/gitolite-admin
 
 	# If it succeeded without errors you can remove the cloned repo
 	sudo rm -rf /tmp/gitolite-admin
@@ -108,20 +104,21 @@
 
 function install_gitlab() {
 	# We'll install GitLab into home directory of the user "gitlab"
-	cd /home/gitlab
+	cd /home/git
 
 	# Clone GitLab repository
-	sudo -u gitlab -H git clone https://github.com/gitlabhq/gitlabhq.git gitlab
+	sudo -u git -H git clone https://github.com/gitlabhq/gitlabhq.git gitlab
+    sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-shell.git -b v1.9.3
 
-	# Go to gitlab dir 
-	cd /home/gitlab/gitlab
+	# Go to gitlab dir
+	cd /home/git/gitlab
 
 	# Checkout to stable release
-	sudo -u gitlab -H git checkout 4-1-stable
+	sudo -u git -H git checkout 6-8-stable
 }
 
 function configure_gitlab() {
-	cd /home/gitlab/gitlab
+	cd /home/git/gitlab
 
 	# Copy the example GitLab config
 	#sudo -u gitlab -H cp config/gitlab.yml.example config/gitlab.yml
@@ -130,45 +127,45 @@
 	# charm config
 	host=`config-get host`
 	# TODO: add default values
-	sudo -u gitlab -H sh -c "sed -e 's/^  host: localhost/  host: $host/g' < config/gitlab.yml.example > config/gitlab.yml"
+	sudo -u git -H sh -c "sed -e 's/^  host: localhost/  host: $host/g' < config/gitlab.yml.example > config/gitlab.yml"
 
 	# TODO: update other config items in gitlab.yml
 	# sed -itmp
 
 	# Make sure GitLab can write to the log/ and tmp/ directories
-	sudo chown -R gitlab log/
-	sudo chown -R gitlab tmp/
+	sudo chown -R git log/
+	sudo chown -R git tmp/
 	sudo chmod -R u+rwX  log/
 	sudo chmod -R u+rwX  tmp/
 
 	# Make directory for satellites
-	sudo -u gitlab -H mkdir /home/gitlab/gitlab-satellites
-	
+	sudo -u git -H mkdir /home/git/gitlab-satellites
+
 	# Copy the example Unicorn config
-	sudo -u gitlab -H cp config/unicorn.rb.example config/unicorn.rb
+	sudo -u git -H cp config/unicorn.rb.example config/unicorn.rb
 }
 
 function configure_git {
-	sudo -u gitlab -H git config --global user.name "GitLab"
+	sudo -u git -H git config --global user.name "GitLab"
 	# TODO: get from charm config.yaml
-	sudo -u gitlab -H git config --global user.email "gitlab@localhost"
+	sudo -u git -H git config --global user.email "gitlab@localhost"
 }
 
 function setup_gitlab_hooks() {
-	cd ~gitlab/gitlab
+	cd ~git/gitlab
 	sudo cp ./lib/hooks/post-receive /home/git/.gitolite/hooks/common/post-receive
 	sudo chown git:git /home/git/.gitolite/hooks/common/post-receive
 	cd -
 }
 
 function init_script() {
-	sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/4-1-stable/init.d/gitlab
+	sudo curl --output /etc/init.d/gitlab https://raw.githubusercontent.com/gitlabhq/gitlabhq/fefa10c3c208cb0cce6e25e498221d1d97d26238/lib/support/init.d/gitlab
 	sudo chmod +x /etc/init.d/gitlab
 	sudo update-rc.d gitlab defaults 21
 }
 
 function config_nginx() {
-	sudo curl --output /etc/nginx/sites-available/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/4-1-stable/nginx/gitlab
+	sudo curl --output /etc/nginx/sites-available/gitlab https://raw.githubusercontent.com/gitlabhq/gitlabhq/fefa10c3c208cb0cce6e25e498221d1d97d26238/lib/support/nginx/gitlab
 	sudo ln -s /etc/nginx/sites-available/gitlab /etc/nginx/sites-enabled/gitlab
 	# TODO: allow for config of hostname
 	sed -i -e 's/YOUR_SERVER_IP/0.0.0.0/g' /etc/nginx/sites-available/gitlab
@@ -182,6 +179,6 @@
 install_gitlab
 configure_gitlab
 configure_git
-setup_gitlab_hooks
+#setup_gitlab_hooks
 init_script
 config_nginx

=== modified file 'hooks/start'
--- hooks/start	2013-02-01 22:47:17 +0000
+++ hooks/start	2014-05-09 15:56:56 +0000
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Avoid starting a unconfigured instance that has no database
-if [ -f ~gitlab/gitlab/config/database.yml ]; then
+if [ -f ~git/gitlab/config/database.yml ]; then
         juju-log "Starting GitLab"
         sudo service gitlab start
         juju-log "Starting nginx"