diff --git a/CHANGELOG.md b/CHANGELOG.md index 160c60c..64c876e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/) ### Added - feat: add gitlab_data_dir variable +- feat: add gitlab_pages_url variable ## [v1.0.0] - 2020-04-11 diff --git a/README.md b/README.md index bc16926..1b4655c 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,8 @@ Install and configure a Gitlab server ## Role variables -- `gitlab_url` - set the gitlab url (default: `http://gitlab.example.com`) +- `gitlab_url` - set the gitlab url +- `gitlab_pages_url` - set the gitlab pages url - `gitlab_data_dir` - set the path for repository - `gitlab_config` - set the config diff --git a/templates/gitlab.rb.j2 b/templates/gitlab.rb.j2 index a1dfbfb..33470da 100644 --- a/templates/gitlab.rb.j2 +++ b/templates/gitlab.rb.j2 @@ -1,8 +1,10 @@ # {{ ansible_managed }} external_url '{{ gitlab_url }}' +{% if gitlab_pages_url is defined %} +pages_external_url '{{ gitlab_pages_url }}' +{% endif %} {% if gitlab_data_dir is defined %} - git_data_dirs({ "default" => { "path" => "{{ gitlab_data_dir }}"