Download as
Browse Code »

Commit 10b63aaf60f54f7cbb53c08e73011345b366123c

Authored by Jacob Vosmaer
1 parent 1afe865c
Exists in master and in 11 other branches 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Use mail instead of sendmail in release.sh

Showing 2 changed files with 9 additions and 8 deletions   Show diff stats
doc/release.md
  Diff comments   View file @10b63aa
@@ -45,9 +45,13 @@ sudo yum install python-pip @@ -45,9 +45,13 @@ sudo yum install python-pip
45 sudo pip install awscli 45 sudo pip install awscli
46 ``` 46 ```
47 47
48 -# Make sure sendmail is installed; for Debian 7 48 +# Make sure mail is installed
49 ```shell 49 ```shell
50 -sudo apt-get install sendmail-bin 50 +# Ubuntu / Debian
  51 +sudo apt-get install mailutils
  52 +
  53 +# Centos
  54 +sudo yum install mail
51 ``` 55 ```
52 56
53 As omnibus-build user: 57 As omnibus-build user:
@@ -61,7 +65,7 @@ sudo su - omnibus-build @@ -61,7 +65,7 @@ sudo su - omnibus-build
61 - Test email delivery: 65 - Test email delivery:
62 66
63 ```shell 67 ```shell
64 -echo "Subject: testing from $(uname -n)" | sendmail $(whoami) 68 +date | mail -s "testing from $(uname -n)" $(whoami)
65 ``` 69 ```
66 70
67 - Configure aws credentials 71 - Configure aws credentials
@@ -123,4 +127,4 @@ See a previous [CE example](https://gitlab.com/gitlab-com/www-gitlab-com/merge_r @@ -123,4 +127,4 @@ See a previous [CE example](https://gitlab.com/gitlab-com/www-gitlab-com/merge_r
123 and [EE example](https://dev.gitlab.org/gitlab/gitlab-ee/commit/7301417820404f92ca7c0a9940408ef414ef3c01). 127 and [EE example](https://dev.gitlab.org/gitlab/gitlab-ee/commit/7301417820404f92ca7c0a9940408ef414ef3c01).
124 128
125 [the gitlab-rails version in omnibus-gitlab]: ../master/config/software/gitlab-rails.rb#L20 129 [the gitlab-rails version in omnibus-gitlab]: ../master/config/software/gitlab-rails.rb#L20
126 -[the source]: ../master/config/software/gitlab-rails.rb#L34  
127 \ No newline at end of file 130 \ No newline at end of file
  131 +[the source]: ../master/config/software/gitlab-rails.rb#L34
@@ -15,7 +15,4 @@ fi @@ -15,7 +15,4 @@ fi
15 15
16 # We assume that email to the current system user will somehow reach the right 16 # We assume that email to the current system user will somehow reach the right
17 # human eyes 17 # human eyes
18 -sendmail $(whoami) <<EOF  
19 -Subject: ${subject}  
20 -$(tail ${build}.log)  
21 -EOF 18 +tail ${build}.log | mail -s "${subject}" $(whoami)