Skip to content

Commit

Permalink
Merge pull request #185 from consul/bundler2
Browse files Browse the repository at this point in the history
Install CONSUL version 1.4.0
  • Loading branch information
javierm committed Nov 24, 2021
2 parents 9699c15 + 9dad451 commit 8ae4168
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Setup locally for your [development environment](https://docs.consulproject.org/
Checkout the latest stable version:

```
git checkout origin/1.3.1 -b stable
git checkout origin/1.4.0 -b stable
```

Create your `deploy-secrets.yml`
Expand Down Expand Up @@ -205,13 +205,13 @@ Using https instead of http is an important security configuration. Before you b

Once you have that setup we need to configure the Installer to use your domain in the application.

First, uncomment the `domain` variable in the [configuration file](https://github.com/consul/installer/blob/1.3.1/group_vars/all) and update it with your domain name:
First, uncomment the `domain` variable in the [configuration file](https://github.com/consul/installer/blob/1.4.0/group_vars/all) and update it with your domain name:

```
#domain: "your_domain.com"
```

Next, uncomment the `letsencrypt_email` variable in the [configuration file](https://github.com/consul/installer/blob/1.3.1/group_vars/all) and update it with a valid email address:
Next, uncomment the `letsencrypt_email` variable in the [configuration file](https://github.com/consul/installer/blob/1.4.0/group_vars/all) and update it with a valid email address:

```
#letsencrypt_email: "[email protected]"
Expand Down Expand Up @@ -253,7 +253,7 @@ smtp_password: "password"
smtp_authentication: "plain"
```

There are many more variables available check them out [here]((https://github.com/consul/installer/blob/1.3.1/group_vars/all))
There are many more variables available check them out [here]((https://github.com/consul/installer/blob/1.4.0/group_vars/all))

## Other deployment options

Expand Down Expand Up @@ -283,7 +283,7 @@ If you do not have `root` access, you will need your system administrator to gra

## Using a different user than deploy

Change the variable [deploy_user](https://github.com/consul/installer/blob/1.3.1/group_vars/all#L13) to the username you would like to use.
Change the variable [deploy_user](https://github.com/consul/installer/blob/1.4.0/group_vars/all#L13) to the username you would like to use.

## Ansible Documentation

Expand Down
12 changes: 6 additions & 6 deletions roles/errbit/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
shell: "git clone https://github.com/errbit/errbit.git {{ errbit_dir }}"
when: errbit_repo.stat.exists == False

# TODO: Remove when we upgrade to bundler 2.x
- name: Use bundler 1.x
replace:
path: "{{ errbit_dir }}/Gemfile.lock"
regexp: ' 2.*'
replace: ' 1.17.1'
- name: Add Ruby 2.7 compatibility
template:
src: "{{ playbook_dir }}/roles/errbit/templates/UserGemfile"
dest: "{{ errbit_dir }}/UserGemfile"
owner: "{{ deploy_user }}"
group: "{{ deploy_group }}"

- name: Create log folder
file:
Expand Down
1 change: 1 addition & 0 deletions roles/errbit/templates/UserGemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
gem "bigdecimal", "~> 1.4.4"
2 changes: 1 addition & 1 deletion roles/folder_structure/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
state: directory

- name: Create first release
shell: "git archive 1.3.1 | /usr/bin/env tar -x -f - -C {{ first_release_dir }}"
shell: "git archive 1.4.0 | /usr/bin/env tar -x -f - -C {{ first_release_dir }}"
args:
chdir: "{{ consul_dir }}/repo"

Expand Down

0 comments on commit 8ae4168

Please sign in to comment.