Skip to content
Snippets Groups Projects
Commit 72f8afb0 authored by jurgenhaas's avatar jurgenhaas
Browse files

ansible-playbooks/general#85 Linting

parent 01d2dc77
Branches
No related tags found
No related merge requests found
......@@ -35,7 +35,7 @@
- libpq-dev
- nginx
- name: "Install Python Components"
- name: Install Python Components
pip:
name='{{ packages }}'
state='present'
......@@ -58,7 +58,7 @@
dest: /home/git/.gitconfig
owner: git
group: git
mode: '664'
mode: 664
- name: create database user
become: yes
......@@ -106,8 +106,8 @@
- name: configure gitlab.yml
replace:
dest: /home/git/gitlab/config/gitlab.yml
regexp: '(\s*{{ item.key }}{{":"}}).*'
replace: '\1 {{ item.value }}'
regexp: (\s*{{ item.key }}{{":"}}).*
replace: \1 {{ item.value }}
with_items:
- { key: "host" , value: "{{ gitlab_config_host }}" }
- { key: "email_from" , value: "{{ gitlab_config_email_from }}" }
......
......@@ -41,39 +41,39 @@ gitlab_rails['gitlab_email_reply_to'] = '{{ gitlab_email_reply_to }}'
# gitlab_rails['ldap_enabled'] = false
# gitlab_rails['ldap_servers'] = YAML.load <<-'EOS' # remember to close this block with 'EOS' below
# main: # 'main' is the GitLab 'provider ID' of this LDAP server
# label: 'LDAP'
# host: '_your_ldap_server'
# label: LDAP
# host: _your_ldap_server
# port: 389
# uid: 'sAMAccountName'
# method: 'plain' # "tls" or "ssl" or "plain"
# bind_dn: '_the_full_dn_of_the_user_you_will_bind_with'
# password: '_the_password_of_the_bind_user'
# uid: sAMAccountName
# method: plain # "tls" or "ssl" or "plain"
# bind_dn: _the_full_dn_of_the_user_you_will_bind_with
# password: _the_password_of_the_bind_user
# active_directory: true
# allow_username_or_email_login: false
# block_auto_created_users: false
# base: ''
# user_filter: ''
# base:
# user_filter:
# ## EE only
# group_base: ''
# admin_group: ''
# group_base:
# admin_group:
# sync_ssh_keys: false
#
# secondary: # 'secondary' is the GitLab 'provider ID' of second LDAP server
# label: 'LDAP'
# host: '_your_ldap_server'
# label: LDAP
# host: _your_ldap_server
# port: 389
# uid: 'sAMAccountName'
# method: 'plain' # "tls" or "ssl" or "plain"
# bind_dn: '_the_full_dn_of_the_user_you_will_bind_with'
# password: '_the_password_of_the_bind_user'
# uid: sAMAccountName
# method: plain # "tls" or "ssl" or "plain"
# bind_dn: _the_full_dn_of_the_user_you_will_bind_with
# password: _the_password_of_the_bind_user
# active_directory: true
# allow_username_or_email_login: false
# block_auto_created_users: false
# base: ''
# user_filter: ''
# base:
# user_filter:
# ## EE only
# group_base: ''
# admin_group: ''
# group_base:
# admin_group:
# sync_ssh_keys: false
# EOS
......@@ -222,7 +222,7 @@ gitlab_rails['smtp_domain'] = "{{ gitlab_rails.smtp.domain }}"
gitlab_rails['smtp_authentication'] = "{{ gitlab_rails.smtp.authentication }}"
gitlab_rails['smtp_enable_starttls_auto'] = {{ gitlab_rails.smtp.enable_starttls_auto }}
gitlab_rails['smtp_tls'] = {{ gitlab_rails.smtp.tls }}
gitlab_rails['smtp_openssl_verify_mode'] = '{{ gitlab_rails.smtp.openssl_verify_mode }}' # Can be: 'none', 'peer', 'client_once', 'fail_if_no_peer_cert', see http://api.rubyonrails.org/classes/ActionMailer/Base.html
gitlab_rails['smtp_openssl_verify_mode'] = '{{ gitlab_rails.smtp.openssl_verify_mode }}' # Can be: none', 'peer', 'client_once', 'fail_if_no_peer_cert, see http://api.rubyonrails.org/classes/ActionMailer/Base.html
# gitlab_rails['smtp_ca_path'] = "/etc/ssl/certs"
# gitlab_rails['smtp_ca_file'] = "/etc/ssl/certs/ca-certificates.crt"
......@@ -276,7 +276,7 @@ unicorn['port'] = 8080
# gitlab_shell['audit_usernames'] = false
# gitlab_shell['log_level'] = 'INFO'
# gitlab_shell['http_settings'] = { user: 'username', password: 'password', ca_file: '/etc/ssl/cert.pem', ca_path: '/etc/pki/tls/certs', self_signed_cert: false}
# gitlab_shell['http_settings'] = { user: username', password: 'password', ca_file: '/etc/ssl/cert.pem', ca_path: '/etc/pki/tls/certs, self_signed_cert: false}
# gitlab_shell['log_directory'] = "/var/log/gitlab/gitlab-shell/"
## If enabled, git-annex needs to be installed on the server where gitlab is setup
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment