Commit cc137bba7905790347418f184c6b02d01af3e225
1 parent
734a5b7d
Exists in
master
and in
4 other branches
Update the references to the script and refer to it from the installation manual.
Update the references to the script and refer to it from the installation manual. Indent the code block.
Showing
2 changed files
with
8 additions
and
5 deletions
Show diff stats
doc/installation.md
| ... | ... | @@ -51,6 +51,12 @@ Also read the [Read this before you submit an issue](https://github.com/gitlabhq |
| 51 | 51 | > curl https://raw.github.com/gitlabhq/gitlabhq/master/doc/debian_ubuntu.sh | sh |
| 52 | 52 | > |
| 53 | 53 | > Now you can go to step 4" |
| 54 | +> | |
| 55 | +> Or if you are installing on Amazon Web Services using Ubuntu 12.04 you can do all steps (1 to 6) at once with: | |
| 56 | +> | |
| 57 | +> curl https://raw.github.com/gitlabhq/gitlabhq/master/lib/support/aws/debian_ubuntu_aws.sh | sh | |
| 58 | +> | |
| 59 | +> for more detailed instructions read the HOWTO section of [the script](https://github.com/gitlabhq/gitlabhq/blob/master/lib/support/aws/debian_ubuntu_aws.sh) | |
| 54 | 60 | > - - - |
| 55 | 61 | |
| 56 | 62 | # 1. Install packages | ... | ... |
lib/support/aws/debian_ubuntu_aws.sh
| ... | ... | @@ -6,9 +6,6 @@ |
| 6 | 6 | # This script only works on Amazon Web Services (AWS). |
| 7 | 7 | # The operating system used is Ubuntu 12.04 64bit. |
| 8 | 8 | |
| 9 | -# TODO | |
| 10 | -# @dosire will send a pull request after this is merged in to change dosire/gitlabhq/non-interactive-aws-install links to gitlabhq/gitlabhq/master and reference this script from installation.md | |
| 11 | - | |
| 12 | 9 | # HOWTO |
| 13 | 10 | # Signup for AWS, free tier are available at http://aws.amazon.com/free/ |
| 14 | 11 | # Go to EC2 tab in the AWS console EC2 https://console.aws.amazon.com/ec2/home |
| ... | ... | @@ -33,7 +30,7 @@ |
| 33 | 30 | # Give the following command in your local terminal while suptituting the UPPERCASE items |
| 34 | 31 | # 'ssh -i LOCATION_OF_AWS_KEY_PAIR_PRIVATE_KEY PUBLIC_DNS_OF_THE_NEW_SERVER' |
| 35 | 32 | # Execute the curl command below and when its ready follow the printed 'Log in instuctions' |
| 36 | -# curl https://raw.github.com/dosire/gitlabhq/non-interactive-aws-install/lib/support/aws/debian_ubuntu_aws.sh | sh | |
| 33 | +# curl https://raw.github.com/gitlabhq/gitlabhq/master/lib/support/aws/debian_ubuntu_aws.sh | sh | |
| 37 | 34 | |
| 38 | 35 | # Prevent fingerprint prompt for localhost in step 1 to 3. |
| 39 | 36 | echo "Host localhost |
| ... | ... | @@ -41,7 +38,7 @@ echo "Host localhost |
| 41 | 38 | UserKnownHostsFile=/dev/null" | sudo tee -a /etc/ssh/ssh_config |
| 42 | 39 | |
| 43 | 40 | # Existing script for Step 1 to 3 |
| 44 | -curl https://raw.github.com/dosire/gitlabhq/non-interactive-aws-install/doc/debian_ubuntu.sh | sh | |
| 41 | +curl https://raw.github.com/gitlabhq/gitlabhq/master/doc/debian_ubuntu.sh | sh | |
| 45 | 42 | |
| 46 | 43 | # Install MySQL |
| 47 | 44 | sudo apt-get install -y makepasswd # Needed to create a unique password non-interactively. | ... | ... |