diff options
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/common/tasks/main.yml | 9 | ||||
| -rw-r--r-- | ansible/roles/influx/tasks/main.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/postgres/files/postgresql.conf | 10 | ||||
| -rw-r--r-- | ansible/roles/postgres/tasks/main.yml | 26 | ||||
| -rw-r--r-- | ansible/roles/snmp/tasks/main.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/web/files/varnish.vcl | 4 | ||||
| -rw-r--r-- | ansible/roles/web/handlers/main.yml | 15 | ||||
| -rw-r--r-- | ansible/roles/web/tasks/main.yml | 68 |
8 files changed, 84 insertions, 58 deletions
diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml index 562af85..4c27c32 100644 --- a/ansible/roles/common/tasks/main.yml +++ b/ansible/roles/common/tasks/main.yml @@ -1,3 +1,12 @@ +- name: Install basic packages + apt: + name: [ + 'curl', + 'vim', + 'git', + 'iptables-persistent'] + state: present + - name: Gondul-repo become: true tags: diff --git a/ansible/roles/influx/tasks/main.yml b/ansible/roles/influx/tasks/main.yml index 236c2a9..cb3a784 100644 --- a/ansible/roles/influx/tasks/main.yml +++ b/ansible/roles/influx/tasks/main.yml @@ -1,9 +1,7 @@ - name: Install apt-packages apt: - name: "{{ item }}" + name: 'apt-transport-https' state: present - with_items: - apt-transport-https - name: Import InfluxDB GPG signing key apt_key: url=https://repos.influxdata.com/influxdb.key state=present diff --git a/ansible/roles/postgres/files/postgresql.conf b/ansible/roles/postgres/files/postgresql.conf index cf6e67e..7c45ea4 100644 --- a/ansible/roles/postgres/files/postgresql.conf +++ b/ansible/roles/postgres/files/postgresql.conf @@ -38,15 +38,15 @@ # The default values of these variables are driven from the -D command-line # option or PGDATA environment variable, represented here as ConfigDir. -data_directory = '/var/lib/postgresql/9.4/main' # use data in another directory +data_directory = '/var/lib/postgresql/9.6/main' # use data in another directory # (change requires restart) -hba_file = '/etc/postgresql/9.4/main/pg_hba.conf' # host-based authentication file +hba_file = '/etc/postgresql/9.6/main/pg_hba.conf' # host-based authentication file # (change requires restart) -ident_file = '/etc/postgresql/9.4/main/pg_ident.conf' # ident configuration file +ident_file = '/etc/postgresql/9.6/main/pg_ident.conf' # ident configuration file # (change requires restart) # If external_pid_file is not explicitly set, no extra PID file is written. -external_pid_file = '/var/run/postgresql/9.4-main.pid' # write an extra PID file +external_pid_file = '/var/run/postgresql/9.6-main.pid' # write an extra PID file # (change requires restart) @@ -450,7 +450,7 @@ log_timezone = 'UTC' #track_functions = none # none, pl, all #track_activity_query_size = 1024 # (change requires restart) #update_process_title = on -stats_temp_directory = '/var/run/postgresql/9.4-main.pg_stat_tmp' +stats_temp_directory = '/var/run/postgresql/9.6-main.pg_stat_tmp' # - Statistics Monitoring - diff --git a/ansible/roles/postgres/tasks/main.yml b/ansible/roles/postgres/tasks/main.yml index 9adeafe..902eeb9 100644 --- a/ansible/roles/postgres/tasks/main.yml +++ b/ansible/roles/postgres/tasks/main.yml @@ -1,14 +1,13 @@ +# Postgres +# https://github.com/ansible/ansible/issues/16048#issuecomment-229012509 +# - name: Install db-packages apt: - name: "{{ item }}" + name: ['postgresql', 'python-psycopg2', 'sudo'] state: present - with_items: - - postgresql-9.4 - - python-psycopg2 - - sudo - name: Drop postgresql-config copy: - dest: /etc/postgresql/9.4/main/postgresql.conf + dest: /etc/postgresql/9.6/main/postgresql.conf src: postgresql.conf - name: Add db to hosts lineinfile: @@ -25,15 +24,24 @@ state: present line: "{{ whoami.stdout }} ALL=(postgres) NOPASSWD: ALL" - name: Make postgres-db - become_user: postgres postgresql_db: name: nms -- name: Ensure a valid postgres-user + become: true become_user: postgres + vars: + ansible_ssh_pipelining: true +- name: Ensure a valid postgres-user postgresql_user: db: nms name: nms password: risbrod -- name: Import SQL + become: true become_user: postgres + vars: + ansible_ssh_pipelining: true +- name: Import SQL shell: psql nms < /opt/gondul/ansible/roles/postgres/files/schema.sql + become: true + become_user: postgres + vars: + ansible_ssh_pipelining: true diff --git a/ansible/roles/snmp/tasks/main.yml b/ansible/roles/snmp/tasks/main.yml index 2cb7165..6056a25 100644 --- a/ansible/roles/snmp/tasks/main.yml +++ b/ansible/roles/snmp/tasks/main.yml @@ -1,8 +1,10 @@ -- file: +- name: Create data directory + file: path: /opt/gondul/data state: directory mode: 0755 -- stat: +- name: register mibdir + stat: path: /opt/gondul/data/mibs register: mibdir - name: Get mibs diff --git a/ansible/roles/web/files/varnish.vcl b/ansible/roles/web/files/varnish.vcl index b082971..2cdbbfe 100644 --- a/ansible/roles/web/files/varnish.vcl +++ b/ansible/roles/web/files/varnish.vcl @@ -3,12 +3,12 @@ vcl 4.0; backend default { - .host = "localhost"; + .host = "::1"; .port = "8080"; } backend influx { - .host = "localhost"; + .host = "::1"; .port = "8086"; } diff --git a/ansible/roles/web/handlers/main.yml b/ansible/roles/web/handlers/main.yml index 3f71f4c..5d36f51 100644 --- a/ansible/roles/web/handlers/main.yml +++ b/ansible/roles/web/handlers/main.yml @@ -1,7 +1,16 @@ --- - name: restart apache - service: name=apache2 state=restarted + systemd: + state: restarted + daemon_reload: yes + name: apache2 + - name: restart varnish - service: name=varnish state=restarted + systemd: + state: restarted + daemon_reload: yes + name: varnish + - name: reload systemd - command: systemctl daemon-reload + systemd: + daemon_reload: yes diff --git a/ansible/roles/web/tasks/main.yml b/ansible/roles/web/tasks/main.yml index dce3f4c..1c89947 100644 --- a/ansible/roles/web/tasks/main.yml +++ b/ansible/roles/web/tasks/main.yml @@ -1,39 +1,38 @@ - name: Install front-packages apt: - name: "{{ item }}" + name: [ + 'libcapture-tiny-perl', + 'libcommon-sense-perl', + 'libdata-dumper-simple-perl', + 'libdbd-pg-perl', + 'libdbi-perl', + 'libdigest-perl', + 'libgd-perl', + 'libgeo-ip-perl', + 'libhtml-parser-perl', + 'libhtml-template-perl', + 'libjson-perl', + 'libjson-xs-perl', + 'libnetaddr-ip-perl', + 'libnet-cidr-perl', + 'libnet-ip-perl', + 'libnet-oping-perl', + 'libnet-rawip-perl', + 'libsnmp-perl', + 'libsocket6-perl', + 'libsocket-perl', + 'libswitch-perl', + 'libtimedate-perl', + 'perl', + 'perl-base', + 'perl-modules', + 'libfreezethaw-perl', + 'apache2', + 'libxml2-dev', + 'build-essential', + 'cpanminus', + 'apt-transport-https'] state: present - with_items: - - libcapture-tiny-perl - - libcommon-sense-perl - - libdata-dumper-simple-perl - - libdbd-pg-perl - - libdbi-perl - - libdigest-perl - - libgd-perl - - libgeo-ip-perl - - libhtml-parser-perl - - libhtml-template-perl - - libjson-perl - - libjson-xs-perl - - libnetaddr-ip-perl - - libnet-cidr-perl - - libnet-ip-perl - - libnet-oping-perl - - libnet-rawip-perl - - libsnmp-perl - - libsocket6-perl - - libsocket-perl - - libswitch-perl - - libtimedate-perl - - perl - - perl-base - - perl-modules - - libfreezethaw-perl - - apache2 - - libxml2-dev - - build-essential - - cpanminus - - apt-transport-https - name: Add packagecloud.io Varnish apt key. apt_key: @@ -85,5 +84,6 @@ ignore_errors: true notify: restart apache -- cpanm: +- name: Install InfluxDB module + cpanm: name: AnyEvent::InfluxDB |