refactoring

docker/docker-compose.yaml

@@ -1,54 +0,0 @@
-version: '3'
-services:
-  nginx:
-    image: nginx-geoip:latest #https://git.limbosolutions.com/kb/nginx
-    volumes:
-      - nginx-conf.d:/etc/nginx/conf.d
-      - letsencrypt-conf:/etc/letsencrypt
-      - certbot-www:/var/www/certbot
-      - nginx-log:/var/log/nginx
-    ports:
-      - 443:443
-      - 80:80
-      #- 8080:8080
-      - 2222:2222
-    networks:
-      - public
-      - private
-    command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\"'"
-    restart: unless-stopped
-  promtail:
-    image: grafana/promtail
-    volumes:
-      - nginx-log:/mnt/nginx-logs
-      - promtail_etc:/etc/promtail
-    environment:
-      - PROMTAIL_LOKISERVER_ADDRESS=${PROMTAIL_LOKISERVER_ADDRESS}
-    command: -config.file=/etc/promtail/config.yml -config.expand-env=true
-    networks:
-      - private
-  duplicati:
-    image: duplicati-mysqlclient:latest
-    volumes:
-      - duplicati_tmpdata:/data
-      - nginx-conf.d:/bck/nginx-conf.d
-      - letsencrypt-conf:/bck/letsencrypt-conf
-      - certbot-www:/bck/certbot-www
-      - duplicati_tmpdata:/bck/duplicati_tmpdata
-    #ports:
-    #  - 8205:8200
-    networks:
-      - private
-    restart: unless-stopped
-volumes:
-  nginx-conf.d:
-  letsencrypt-conf:
-  certbot-www:
-  duplicati_tmpdata:
-  telegraf-etc:
-  nginx-log:
-  promtail_etc:
-networks:
-  public:
-  private:
-  

docker/nginx/rootfs/etc/nginx/conf.d/default.conf

@@ -1,42 +0,0 @@
-log_format json_analytics escape=json '{'
-                    '"msec": "$msec", ' # request unixtime in seconds with a milliseconds resolution
-                    '"connection": "$connection", ' # connection serial number
-                    '"connection_requests": "$connection_requests", ' # number of requests made in connection
-                    '"pid": "$pid", ' # process pid
-                    '"request_id": "$request_id", ' # the unique request id
-                    '"request_length": "$request_length", ' # request length (including headers and body)
-                    '"remote_addr": "$remote_addr", ' # client IP
-                    '"remote_user": "$remote_user", ' # client HTTP username
-                    '"remote_port": "$remote_port", ' # client port
-                    '"time_local": "$time_local", '
-                    '"time_iso8601": "$time_iso8601", ' # local time in the ISO 8601 standard format
-                    '"request": "$request", ' # full path no arguments if the request
-                    '"request_uri": "$request_uri", ' # full path and arguments if the request
-                    '"args": "$args", ' # args
-                    '"status": "$status", ' # response status code
-                    '"body_bytes_sent": "$body_bytes_sent", ' # the number of body bytes exclude headers sent to a client
-                    '"bytes_sent": "$bytes_sent", ' # the number of bytes sent to a client
-                    '"http_referer": "$http_referer", ' # HTTP referer
-                    '"http_user_agent": "$http_user_agent", ' # user agent
-                    '"http_x_forwarded_for": "$http_x_forwarded_for", ' # http_x_forwarded_for
-                    '"http_host": "$http_host", ' # the request Host: header
-                    '"server_name": "$server_name", ' # the name of the vhost serving the request
-                    '"request_time": "$request_time", ' # request processing time in seconds with msec resolution
-                    '"upstream": "$upstream_addr", ' # upstream backend server for proxied requests
-                    '"upstream_connect_time": "$upstream_connect_time", ' # upstream handshake time incl. TLS
-                    '"upstream_header_time": "$upstream_header_time", ' # time spent receiving upstream headers
-                    '"upstream_response_time": "$upstream_response_time", ' # time spend receiving upstream body
-                    '"upstream_response_length": "$upstream_response_length", ' # upstream response length
-                    '"upstream_cache_status": "$upstream_cache_status", ' # cache HIT/MISS where applicable
-                    '"ssl_protocol": "$ssl_protocol", ' # TLS protocol
-                    '"ssl_cipher": "$ssl_cipher", ' # TLS cipher
-                    '"scheme": "$scheme", ' # http or https
-                    '"request_method": "$request_method", ' # request method
-                    '"server_protocol": "$server_protocol", ' # request protocol, like HTTP/1.1 or HTTP/2.0
-                    '"pipe": "$pipe", ' # "p" if request was pipelined, "." otherwise
-                    '"gzip_ratio": "$gzip_ratio", '
-                    '"http_cf_ray": "$http_cf_ray"'
-                    '}';
-
-access_log /var/log/nginx/access_json_analytics.log json_analytics;
-