From adb5922b276a6e2f3f774bfb70a2a9f1d5cb3b87 Mon Sep 17 00:00:00 2001 From: Heinrich Reinking Date: Mon, 16 Mar 2020 15:49:07 -0300 Subject: [PATCH 1/5] Init commit --- hieradata/site/cp/role/graylog.yaml | 27 -------------------------- hieradata/site/cp/role/mongodb.yaml | 4 ++++ site/graylog_replica/manifests/init.pp | 0 3 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 hieradata/site/cp/role/graylog.yaml create mode 100644 hieradata/site/cp/role/mongodb.yaml create mode 100644 site/graylog_replica/manifests/init.pp diff --git a/hieradata/site/cp/role/graylog.yaml b/hieradata/site/cp/role/graylog.yaml deleted file mode 100644 index 55ff3e0174..0000000000 --- a/hieradata/site/cp/role/graylog.yaml +++ /dev/null @@ -1,27 +0,0 @@ ---- -country: "CL" -state: "Coquimbo" -locality: "La Serena" -organization: "LSST" -division: "IT" - -canonical_name: "gs-graylog-node-01.cp.cl.lsst.org" -server_ip_address: "139.229.162.106" -alternative_dns_1: "gs-graylog-node-01.cp.cl.lsst.org" - -firewalld::ports: - "Opening port for Graylog service": - ensure: "present" - zone: "public" - port: 9000 - protocol: "tcp" - "Opening port for Syslog in public zone": - ensure: "present" - zone: "public" - port: 5514 - protocol: "udp" - "Opening port for pfsense in public zone": - ensure: "present" - zone: "public" - port: 6514 - protocol: "udp" diff --git a/hieradata/site/cp/role/mongodb.yaml b/hieradata/site/cp/role/mongodb.yaml new file mode 100644 index 0000000000..fd7898e7c8 --- /dev/null +++ b/hieradata/site/cp/role/mongodb.yaml @@ -0,0 +1,4 @@ +--- +classes: + - "profile::core::common" + - "graylog_replica" \ No newline at end of file diff --git a/site/graylog_replica/manifests/init.pp b/site/graylog_replica/manifests/init.pp new file mode 100644 index 0000000000..e69de29bb2 From a87cec6f1ef71a6c9e6f42c81bfb34603fc90b0e Mon Sep 17 00:00:00 2001 From: Heinrich Reinking Date: Mon, 16 Mar 2020 16:50:13 -0300 Subject: [PATCH 2/5] add allow zone for vpn --- hieradata/site/ls/role/dnscache.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/hieradata/site/ls/role/dnscache.yaml b/hieradata/site/ls/role/dnscache.yaml index c17c5a7d84..5f95bcbee7 100644 --- a/hieradata/site/ls/role/dnscache.yaml +++ b/hieradata/site/ls/role/dnscache.yaml @@ -4,6 +4,7 @@ dns::forwarders: - "208.67.220.220" dns::allow_recursion: - "139.229.0.0/16" + - "198.16.0.0/16" - "localnets" - "localhost" dns::zones: From 7b17b32796a846c102e1ba4606edfd08c3236582 Mon Sep 17 00:00:00 2001 From: Heinrich Reinking Date: Mon, 16 Mar 2020 16:55:13 -0300 Subject: [PATCH 3/5] correct zone --- hieradata/site/ls/role/dnscache.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hieradata/site/ls/role/dnscache.yaml b/hieradata/site/ls/role/dnscache.yaml index 5f95bcbee7..0f1f0468ff 100644 --- a/hieradata/site/ls/role/dnscache.yaml +++ b/hieradata/site/ls/role/dnscache.yaml @@ -4,7 +4,7 @@ dns::forwarders: - "208.67.220.220" dns::allow_recursion: - "139.229.0.0/16" - - "198.16.0.0/16" + - "198.19.0.0/16" - "localnets" - "localhost" dns::zones: From bba2728b0e648041390ee2d1c3046de5b83e3472 Mon Sep 17 00:00:00 2001 From: Heinrich Reinking Date: Mon, 16 Mar 2020 17:26:24 -0300 Subject: [PATCH 4/5] add vpn zone to cp/cluster --- hieradata/cluster/corecp/role/dnscache.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/hieradata/cluster/corecp/role/dnscache.yaml b/hieradata/cluster/corecp/role/dnscache.yaml index 960dd45f9d..6323bc3d2b 100644 --- a/hieradata/cluster/corecp/role/dnscache.yaml +++ b/hieradata/cluster/corecp/role/dnscache.yaml @@ -4,6 +4,7 @@ dns::forwarders: - "208.67.220.220" dns::allow_recursion: - "139.229.0.0/16" + - "198.19.0.0/16" - "localnets" - "localhost" dns::zones: From 78ff371b12a91a32435c851484c74ce09057afae Mon Sep 17 00:00:00 2001 From: Heinrich Reinking Date: Mon, 16 Mar 2020 17:42:47 -0300 Subject: [PATCH 5/5] not included in this branch --- hieradata/site/cp/role/mongodb.yaml | 4 ---- site/graylog_replica/manifests/init.pp | 0 2 files changed, 4 deletions(-) delete mode 100644 hieradata/site/cp/role/mongodb.yaml delete mode 100644 site/graylog_replica/manifests/init.pp diff --git a/hieradata/site/cp/role/mongodb.yaml b/hieradata/site/cp/role/mongodb.yaml deleted file mode 100644 index fd7898e7c8..0000000000 --- a/hieradata/site/cp/role/mongodb.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -classes: - - "profile::core::common" - - "graylog_replica" \ No newline at end of file diff --git a/site/graylog_replica/manifests/init.pp b/site/graylog_replica/manifests/init.pp deleted file mode 100644 index e69de29bb2..0000000000