From 1cb5d90536de7fbbc812149c3c5f57842766342e Mon Sep 17 00:00:00 2001 From: Lasse Haugen Date: Sun, 13 Jan 2019 21:21:51 +0100 Subject: Update to debian9 --- ansible/roles/postgres/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ansible') diff --git a/ansible/roles/postgres/tasks/main.yml b/ansible/roles/postgres/tasks/main.yml index 9adeafe..3073046 100644 --- a/ansible/roles/postgres/tasks/main.yml +++ b/ansible/roles/postgres/tasks/main.yml @@ -3,12 +3,12 @@ name: "{{ item }}" state: present with_items: - - postgresql-9.4 + - postgresql - 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: -- cgit v1.2.3 From b25e34d67168ac2bb1d74943940cfa72f464a137 Mon Sep 17 00:00:00 2001 From: Lasse Haugen Date: Sun, 13 Jan 2019 21:53:43 +0100 Subject: changed to 9.6 --- ansible/roles/postgres/files/postgresql.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ansible') 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 - -- cgit v1.2.3 From f5e3ab81ac2d6810b6df0be1b798f5c9100032ac Mon Sep 17 00:00:00 2001 From: slinderud Date: Sun, 13 Jan 2019 23:19:22 +0100 Subject: Fixed ansible postgres bug --- ansible/roles/postgres/tasks/main.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'ansible') diff --git a/ansible/roles/postgres/tasks/main.yml b/ansible/roles/postgres/tasks/main.yml index 9adeafe..6283a75 100644 --- a/ansible/roles/postgres/tasks/main.yml +++ b/ansible/roles/postgres/tasks/main.yml @@ -1,3 +1,6 @@ +# Postgres +# https://github.com/ansible/ansible/issues/16048#issuecomment-229012509 +# - name: Install db-packages apt: name: "{{ item }}" @@ -28,12 +31,27 @@ become_user: postgres postgresql_db: name: nms + # https://github.com/ansible/ansible/issues/16048#issuecomment-229012509 + become: true + become_user: postgres + vars: + ansible_ssh_pipelining: true - name: Ensure a valid postgres-user become_user: postgres postgresql_user: db: nms name: nms password: risbrod + # https://github.com/ansible/ansible/issues/16048#issuecomment-229012509 + become: true + become_user: postgres + vars: + ansible_ssh_pipelining: true - name: Import SQL become_user: postgres shell: psql nms < /opt/gondul/ansible/roles/postgres/files/schema.sql + # https://github.com/ansible/ansible/issues/16048#issuecomment-229012509 + become: true + become_user: postgres + vars: + ansible_ssh_pipelining: true -- cgit v1.2.3 From 7caeb2c763270636261dba584ba489d9e66aca4f Mon Sep 17 00:00:00 2001 From: Lasse Haugen Date: Mon, 14 Jan 2019 15:54:37 +0100 Subject: Change to new ansible style --- ansible/roles/postgres/tasks/main.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'ansible') diff --git a/ansible/roles/postgres/tasks/main.yml b/ansible/roles/postgres/tasks/main.yml index 3073046..61befa5 100644 --- a/ansible/roles/postgres/tasks/main.yml +++ b/ansible/roles/postgres/tasks/main.yml @@ -1,11 +1,7 @@ - name: Install db-packages apt: - name: "{{ item }}" + name: ['postgresql', 'python-psycopg2', 'sudo'] state: present - with_items: - - postgresql - - python-psycopg2 - - sudo - name: Drop postgresql-config copy: dest: /etc/postgresql/9.6/main/postgresql.conf -- cgit v1.2.3 From 4bb5325285119407fc60034c52ce91615698f36f Mon Sep 17 00:00:00 2001 From: Lasse Haugen Date: Mon, 14 Jan 2019 15:57:05 +0100 Subject: Removed dupicates --- ansible/roles/postgres/tasks/main.yml | 3 --- 1 file changed, 3 deletions(-) (limited to 'ansible') diff --git a/ansible/roles/postgres/tasks/main.yml b/ansible/roles/postgres/tasks/main.yml index 7aef2a6..96f5a0b 100644 --- a/ansible/roles/postgres/tasks/main.yml +++ b/ansible/roles/postgres/tasks/main.yml @@ -24,7 +24,6 @@ state: present line: "{{ whoami.stdout }} ALL=(postgres) NOPASSWD: ALL" - name: Make postgres-db - become_user: postgres postgresql_db: name: nms # https://github.com/ansible/ansible/issues/16048#issuecomment-229012509 @@ -33,7 +32,6 @@ vars: ansible_ssh_pipelining: true - name: Ensure a valid postgres-user - become_user: postgres postgresql_user: db: nms name: nms @@ -44,7 +42,6 @@ vars: ansible_ssh_pipelining: true - name: Import SQL - become_user: postgres shell: psql nms < /opt/gondul/ansible/roles/postgres/files/schema.sql # https://github.com/ansible/ansible/issues/16048#issuecomment-229012509 become: true -- cgit v1.2.3 From ca5bf27b0824b691af9895e4ab8d6de378866d12 Mon Sep 17 00:00:00 2001 From: Lasse Haugen Date: Mon, 14 Jan 2019 16:03:56 +0100 Subject: Change to new ansible style --- ansible/roles/influx/tasks/main.yml | 4 +-- ansible/roles/web/tasks/main.yml | 65 ++++++++++++++++++------------------- 2 files changed, 33 insertions(+), 36 deletions(-) (limited to 'ansible') 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/web/tasks/main.yml b/ansible/roles/web/tasks/main.yml index dce3f4c..e687d97 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: -- cgit v1.2.3 From 5fc667a40fad97d289d45aa919a66222341ed44b Mon Sep 17 00:00:00 2001 From: Lasse Haugen Date: Mon, 14 Jan 2019 22:27:38 +0100 Subject: some ansible-lint fixes --- ansible/roles/postgres/tasks/main.yml | 5 +---- ansible/roles/snmp/tasks/main.yml | 6 ++++-- ansible/roles/web/handlers/main.yml | 15 ++++++++++++--- ansible/roles/web/tasks/main.yml | 3 ++- 4 files changed, 19 insertions(+), 10 deletions(-) (limited to 'ansible') diff --git a/ansible/roles/postgres/tasks/main.yml b/ansible/roles/postgres/tasks/main.yml index 96f5a0b..902eeb9 100644 --- a/ansible/roles/postgres/tasks/main.yml +++ b/ansible/roles/postgres/tasks/main.yml @@ -1,4 +1,4 @@ -# Postgres +# Postgres # https://github.com/ansible/ansible/issues/16048#issuecomment-229012509 # - name: Install db-packages @@ -26,7 +26,6 @@ - name: Make postgres-db postgresql_db: name: nms - # https://github.com/ansible/ansible/issues/16048#issuecomment-229012509 become: true become_user: postgres vars: @@ -36,14 +35,12 @@ db: nms name: nms password: risbrod - # https://github.com/ansible/ansible/issues/16048#issuecomment-229012509 become: true become_user: postgres vars: ansible_ssh_pipelining: true - name: Import SQL shell: psql nms < /opt/gondul/ansible/roles/postgres/files/schema.sql - # https://github.com/ansible/ansible/issues/16048#issuecomment-229012509 become: true become_user: postgres vars: 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/handlers/main.yml b/ansible/roles/web/handlers/main.yml index 3f71f4c..6c644ca 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 \ No newline at end of file diff --git a/ansible/roles/web/tasks/main.yml b/ansible/roles/web/tasks/main.yml index e687d97..1c89947 100644 --- a/ansible/roles/web/tasks/main.yml +++ b/ansible/roles/web/tasks/main.yml @@ -84,5 +84,6 @@ ignore_errors: true notify: restart apache -- cpanm: +- name: Install InfluxDB module + cpanm: name: AnyEvent::InfluxDB -- cgit v1.2.3 From 647b31f8ea2bb341fe989e8beafa79abd8e8d57c Mon Sep 17 00:00:00 2001 From: Lasse Haugen Date: Mon, 14 Jan 2019 23:02:05 +0100 Subject: newline fix --- ansible/roles/web/handlers/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ansible') diff --git a/ansible/roles/web/handlers/main.yml b/ansible/roles/web/handlers/main.yml index 6c644ca..5d36f51 100644 --- a/ansible/roles/web/handlers/main.yml +++ b/ansible/roles/web/handlers/main.yml @@ -13,4 +13,4 @@ - name: reload systemd systemd: - daemon_reload: yes \ No newline at end of file + daemon_reload: yes -- cgit v1.2.3 From aedafb4fb169be914782e4b72503e655b7e1bc41 Mon Sep 17 00:00:00 2001 From: Lasse Haugen Date: Mon, 14 Jan 2019 23:02:25 +0100 Subject: Install basic packages --- ansible/roles/common/tasks/main.yml | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'ansible') diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml index 562af85..7b402c3 100644 --- a/ansible/roles/common/tasks/main.yml +++ b/ansible/roles/common/tasks/main.yml @@ -4,3 +4,12 @@ - git-all - git-gondul git: repo={{ git_repo }} dest=/opt/gondul update=no accept_hostkey=yes version={{ git_branch }} + +- name: Install basic packages + action: > + {{ ansible_pkg_mgr }} name={{ item }} state=present update_cache=yes + with_items: + - curl + - vim + - git + - iptables-persistent \ No newline at end of file -- cgit v1.2.3 From ffd8a012c81534fe39eae2a8033679d15ca92abc Mon Sep 17 00:00:00 2001 From: Lasse Haugen Date: Mon, 14 Jan 2019 23:06:41 +0100 Subject: change to apt module --- ansible/roles/common/tasks/main.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'ansible') diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml index 7b402c3..e573383 100644 --- a/ansible/roles/common/tasks/main.yml +++ b/ansible/roles/common/tasks/main.yml @@ -6,10 +6,10 @@ git: repo={{ git_repo }} dest=/opt/gondul update=no accept_hostkey=yes version={{ git_branch }} - name: Install basic packages - action: > - {{ ansible_pkg_mgr }} name={{ item }} state=present update_cache=yes - with_items: - - curl - - vim - - git - - iptables-persistent \ No newline at end of file + apt: + name: [ + 'curl', + 'vim', + 'git', + 'iptables-persistent'] + state: present -- cgit v1.2.3 From bb1cc93d51efcd24d77b51187638e9616c061ed6 Mon Sep 17 00:00:00 2001 From: Lasse Haugen Date: Sat, 19 Jan 2019 19:23:16 +0100 Subject: Moved git install before git pull --- ansible/roles/common/tasks/main.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'ansible') diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml index e573383..4c27c32 100644 --- a/ansible/roles/common/tasks/main.yml +++ b/ansible/roles/common/tasks/main.yml @@ -1,10 +1,3 @@ -- name: Gondul-repo - become: true - tags: - - git-all - - git-gondul - git: repo={{ git_repo }} dest=/opt/gondul update=no accept_hostkey=yes version={{ git_branch }} - - name: Install basic packages apt: name: [ @@ -13,3 +6,10 @@ 'git', 'iptables-persistent'] state: present + +- name: Gondul-repo + become: true + tags: + - git-all + - git-gondul + git: repo={{ git_repo }} dest=/opt/gondul update=no accept_hostkey=yes version={{ git_branch }} -- cgit v1.2.3 From 4f9cd6706692eb6b1a000efb37cfe76e202e6d07 Mon Sep 17 00:00:00 2001 From: Kristian Lyngstol Date: Mon, 21 Jan 2019 19:23:52 +0100 Subject: Use ::1 instead of localhost to avoid multiple IPs Fixes #193 --- ansible/roles/web/files/varnish.vcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ansible') 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"; } -- cgit v1.2.3