diff options
Diffstat (limited to 'modules/tozt')
-rw-r--r-- | modules/tozt/files/nginx/chronograf-tls.conf | 16 | ||||
-rw-r--r-- | modules/tozt/files/nginx/chronograf.conf | 10 | ||||
-rw-r--r-- | modules/tozt/files/nginx/influxdb-tls.conf | 2 | ||||
-rw-r--r-- | modules/tozt/manifests/tick.pp | 14 |
4 files changed, 0 insertions, 42 deletions
diff --git a/modules/tozt/files/nginx/chronograf-tls.conf b/modules/tozt/files/nginx/chronograf-tls.conf deleted file mode 100644 index 87a5447..0000000 --- a/modules/tozt/files/nginx/chronograf-tls.conf +++ /dev/null @@ -1,16 +0,0 @@ -server { - listen 443 ssl; - server_name chronograf.tozt.net; - - access_log /var/log/nginx/chronograf.access.log; - error_log /var/log/nginx/chronograf.error.log; - - include ssl; - - location / { - proxy_pass http://127.0.0.1:8888/; - auth_basic "chronograf"; - auth_basic_user_file "/media/persistent/chronograf.htpasswd"; - } -} -# vim:ft=nginx diff --git a/modules/tozt/files/nginx/chronograf.conf b/modules/tozt/files/nginx/chronograf.conf deleted file mode 100644 index 9011fd6..0000000 --- a/modules/tozt/files/nginx/chronograf.conf +++ /dev/null @@ -1,10 +0,0 @@ -server { - listen 80; - server_name chronograf.tozt.net; - - access_log /var/log/nginx/chronograf.access.log; - error_log /var/log/nginx/chronograf.error.log; - - rewrite ^(.*) https://$host$1 permanent; -} -# vim:ft=nginx diff --git a/modules/tozt/files/nginx/influxdb-tls.conf b/modules/tozt/files/nginx/influxdb-tls.conf index bf52358..2341261 100644 --- a/modules/tozt/files/nginx/influxdb-tls.conf +++ b/modules/tozt/files/nginx/influxdb-tls.conf @@ -9,8 +9,6 @@ server { location / { proxy_pass http://127.0.0.1:8086/; - auth_basic "influxdb"; - auth_basic_user_file "/media/persistent/influxdb.htpasswd"; } } # vim:ft=nginx diff --git a/modules/tozt/manifests/tick.pp b/modules/tozt/manifests/tick.pp index 58da090..8eedf26 100644 --- a/modules/tozt/manifests/tick.pp +++ b/modules/tozt/manifests/tick.pp @@ -23,25 +23,11 @@ class tozt::tick { source => 'puppet:///modules/tozt/kapacitor/partofme-data.tick'; } - secret { - "/media/persistent/influxdb.htpasswd": - source => 'influxdb_htpasswd', - owner => 'http'; - "/media/persistent/chronograf.htpasswd": - source => 'chronograf_htpasswd', - owner => 'http'; - } - nginx::site { "influxdb-tls": source => 'puppet:///modules/tozt/nginx/influxdb-tls.conf', require => Class['certbot']; "influxdb": source => 'puppet:///modules/tozt/nginx/influxdb.conf'; - "chronograf-tls": - source => 'puppet:///modules/tozt/nginx/chronograf-tls.conf', - require => Class['certbot']; - "chronograf": - source => 'puppet:///modules/tozt/nginx/chronograf.conf'; } } |