diff --git a/setup/start/collectd/collectd.conf b/setup/start/collectd/collectd.conf
index 11d9cc1db..b11151bca 100644
--- a/setup/start/collectd/collectd.conf
+++ b/setup/start/collectd/collectd.conf
@@ -121,7 +121,7 @@ LoadPlugin memory
#LoadPlugin netlink
#LoadPlugin network
#LoadPlugin nfs
-LoadPlugin nginx
+#LoadPlugin nginx
#LoadPlugin notify_desktop
#LoadPlugin notify_email
#LoadPlugin ntpd
@@ -149,7 +149,7 @@ LoadPlugin nginx
#LoadPlugin statsd
LoadPlugin swap
#LoadPlugin table
-LoadPlugin tail
+#LoadPlugin tail
#LoadPlugin tail_csv
#LoadPlugin tcpconns
#LoadPlugin teamspeak2
@@ -197,42 +197,11 @@ LoadPlugin write_graphite
IgnoreSelected false
-
- URL "http://127.0.0.1/nginx_status"
-
-
ReportByDevice false
ReportBytes true
-
-
- Instance "nginx"
-
- Regex ".*"
- DSType "CounterInc"
- Type counter
- Instance "errors"
-
-
-
- Instance "nginx"
-
- Regex ".*"
- DSType "CounterInc"
- Type counter
- Instance "requests"
-
-
- Regex " \".*\" [0-9]+ [0-9]+ ([0-9]+)"
- DSType GaugeAverage
- Type delay
- Instance "response"
-
-
-
-
# https://blog.dbrgn.ch/2017/3/10/write-a-collectd-python-plugin/
ModulePath "/home/yellowtent/box/setup/start/collectd/"
diff --git a/src/nginxconfig.ejs b/src/nginxconfig.ejs
index fa8c2ace5..ff2e26a63 100644
--- a/src/nginxconfig.ejs
+++ b/src/nginxconfig.ejs
@@ -15,16 +15,8 @@ server {
<% if (vhost) { -%>
server_name <%= vhost %>;
<% } else { -%>
- # IP based access from collectd or initial cloudron setup. TODO: match the IPv6 address
+ # IP based access for initial cloudron setup. TODO: match the IPv6 address
server_name "~^\d+\.\d+\.\d+\.\d+$";
-
- # collectd
- location /nginx_status {
- stub_status on;
- access_log off;
- allow 127.0.0.1;
- deny all;
- }
<% } -%>
# acme challenges (for cert renewal where the vhost config exists)