From b1b97f2c75d035e45dfe86587d572b537706a5d8 Mon Sep 17 00:00:00 2001
From: Damien De Paoli <ddp@depaoli.id.au>
Date: Wed, 24 Jun 2020 18:32:09 +1000
Subject: [PATCH] removing alertmanager for now, I dont use it and it seems to
 just be restarting/looping anyway.  Also moved comments out to doc directory

---
 docker-compose.yml | 58 ++++++++++------------------------------------
 1 file changed, 12 insertions(+), 46 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ca1f50d..b7b0a20 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -321,7 +321,7 @@ services:
       - 19090:9090
     links:
       - cadvisor:cadvisor
-      - alertmanager:alertmanager
+#      - alertmanager:alertmanager
       - node-exporter:node-exporter
     depends_on:
       - cadvisor
@@ -343,17 +343,17 @@ services:
       - 19100:9100
     restart: always
 
-  alertmanager:
-    image: prom/alertmanager:latest
-    container_name: alertmanager
-    ports:
-      - 19093:9093
-    volumes:
-      - /export/docker/container/alertmanager/:/etc/alertmanager/
-    restart: always
-    command:
-      - '--config.file=/etc/alertmanager/config.yml'
-      - '--storage.path=/alertmanager'
+#  alertmanager:
+#    image: prom/alertmanager:latest
+#    container_name: alertmanager
+#    ports:
+#      - 19093:9093
+#    volumes:
+#      - /export/docker/container/alertmanager/:/etc/alertmanager/
+#    restart: always
+#    command:
+#      - '--config.file=/etc/alertmanager/config.yml'
+#      - '--storage.path=/alertmanager'
 
   cadvisor:
     image: google/cadvisor:latest
@@ -394,37 +394,3 @@ networks:
   default:
     external:
       name: media-net
-
-#
-# letencrypt:
-#
-# goto modem and open port 80 for which server I am runing letsencrypt on
-# turn off any apache port 80 on the server I am on
-# mkdir -p ~/docker/letsencrypt
-# cd ~/docker/letsencrypt
-# sudo docker run --rm -ti -v $PWD/log/:/var/log/letsencrypt/ -v $PWD/etc/:/etc/letsencrypt/ -p 80:80 certbot/certbot certonly --standalone -d mail.depaoli.id.au
-#
-# to renew:
-#  docker run --rm -ti -v $PWD/log/:/var/log/letsencrypt/ -v $PWD/etc/:/etc/letsencrypt/ -p 80:80 -p 443:443 certbot/certbot renew
-#
-#### LDAP commands:
-#     sudo docker exec -it openldap bash
-#     cd /container/service/slapd/assets/certs/ldifs/
-# delete one:
-#     ldapmodify -D "cn=admin,dc=depaoli,dc=id,dc=au" -w a_real_admin_pass_word_for_2o20 -H ldap:// -f del_users.ldif
-# add one (also other files in the /container/service/slapd/assets/certs/ldifs # dir)
-#     ldapadd -D "cn=admin,dc=depaoli,dc=id,dc=au" -w a_real_admin_pass_word_for_2o20 -H ldap:// -f add_users.ldif
-#     ldapadd -D "cn=admin,dc=depaoli,dc=id,dc=au" -w a_real_admin_pass_word_for_2o20 -H ldap:// -f add_groups.ldif
-#     ldapadd -D "cn=admin,dc=depaoli,dc=id,dc=au" -w a_real_admin_pass_word_for_2o20 -H ldap:// -f add_users_to_groups.ldif
-# make a new pwd hash:
-#     mkpasswd --rounds 500000 -m sha-512 --salt `head -c 40 /dev/random | base64 | sed -e 's/+/./g' |  cut -b 10-25` 'Try to break this one!'
-
-
-###### ldap postfix schema
-#
-# convert .schema to .ldif
-#
-# slap??? -f schema.conv -F /tmp
-# cp /tmp/*/{4}postfix* /container...
-#
-# cp {4}postfix*.ldif /etc/ldap/schema/cn=config/cn=schema/