From 9464a1dee43740054a1cb01e00930906e75758b8 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 3 Jan 2018 16:31:25 +0100 Subject: [PATCH] chore: Clean up old Kubernetes configuration --- bitlbee/Dockerfile | 24 --------------- bitlbee/bitlbee-rc.yaml | 38 ------------------------ bitlbee/bitlbee-svc.yaml | 15 ---------- bitlbee/bitlbee.conf | 11 ------- bitlbee/motd.txt | 6 ---- bitlbee/stunnel.conf | 9 ------ gogs/gogs-rc.yaml | 28 ------------------ gogs/gogs-svc.yaml | 14 --------- nginx/conf/http.conf | 54 --------------------------------- nginx/conf/main.conf | 64 ---------------------------------------- nginx/conf/stream.conf | 12 -------- nginx/generate-dhparam | 14 --------- nginx/nginx-svc.yaml | 24 --------------- nginx/nginx.yaml | 51 -------------------------------- nginx/replace-config | 18 ----------- quassel/Dockerfile | 13 -------- quassel/quassel-rc.yaml | 27 ----------------- quassel/quassel-svc.yaml | 12 -------- quassel/stunnel.conf | 16 ---------- tazblog/tazblog-db.yaml | 36 ---------------------- tazblog/tazblog.yaml | 33 --------------------- 21 files changed, 519 deletions(-) delete mode 100644 bitlbee/Dockerfile delete mode 100644 bitlbee/bitlbee-rc.yaml delete mode 100644 bitlbee/bitlbee-svc.yaml delete mode 100644 bitlbee/bitlbee.conf delete mode 100644 bitlbee/motd.txt delete mode 100644 bitlbee/stunnel.conf delete mode 100644 gogs/gogs-rc.yaml delete mode 100644 gogs/gogs-svc.yaml delete mode 100644 nginx/conf/http.conf delete mode 100644 nginx/conf/main.conf delete mode 100644 nginx/conf/stream.conf delete mode 100755 nginx/generate-dhparam delete mode 100644 nginx/nginx-svc.yaml delete mode 100644 nginx/nginx.yaml delete mode 100755 nginx/replace-config delete mode 100644 quassel/Dockerfile delete mode 100644 quassel/quassel-rc.yaml delete mode 100644 quassel/quassel-svc.yaml delete mode 100644 quassel/stunnel.conf delete mode 100644 tazblog/tazblog-db.yaml delete mode 100644 tazblog/tazblog.yaml diff --git a/bitlbee/Dockerfile b/bitlbee/Dockerfile deleted file mode 100644 index ea87d1628..000000000 --- a/bitlbee/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -FROM alpine -MAINTAINER Vincent Ambo - -# Install bitlbee packages -RUN apk update && \ - apk add bitlbee bitlbee-otr bitlbee-doc ca-certificates curl gnutls - -# Install stunnel -RUN echo "http://dl-3.alpinelinux.org/alpine/edge/testing/" >> /etc/apk/repositories -RUN apk update && apk add stunnel - -# Add a user for bitlbee -RUN adduser -D bitlbee - -# Add bitlbee configuration -ADD bitlbee.conf /etc/bitlbee/bitlbee.conf -ADD motd.txt /etc/bitlbee/motd.txt - -# Add stunnel configuration -ADD stunnel.conf /etc/bitlbee/stunnel.conf - -EXPOSE 6697 - -CMD bitlbee -F && stunnel /etc/bitlbee/stunnel.conf diff --git a/bitlbee/bitlbee-rc.yaml b/bitlbee/bitlbee-rc.yaml deleted file mode 100644 index 676ff0622..000000000 --- a/bitlbee/bitlbee-rc.yaml +++ /dev/null @@ -1,38 +0,0 @@ ---- -apiVersion: v1 -kind: ReplicationController -metadata: - name: bitlbee-v1 - labels: - app: bitlbee - spec: v1 -spec: - replicas: 1 - selector: - app: bitlbee - spec: v1 - template: - metadata: - labels: - app: bitlbee - spec: v1 - spec: - containers: - - image: eu.gcr.io/composite-watch-759/bitlbee - imagePullPolicy: Always - name: bitlbee - volumeMounts: - - name: tazj-in-tls - mountPath: /etc/bitlbee/tls - - name: bitlbee-storage - mountPath: /var/lib/bitlbee - ports: - - containerPort: 6697 - volumes: - - name: tazj-in-tls - secret: - secretName: tazj-in-tls - - name: bitlbee-storage - gcePersistentDisk: - pdName: bitlbee-storage - fsType: ext4 diff --git a/bitlbee/bitlbee-svc.yaml b/bitlbee/bitlbee-svc.yaml deleted file mode 100644 index 956e02a41..000000000 --- a/bitlbee/bitlbee-svc.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -apiVersion: v1 -kind: Service -metadata: - name: bitlbee - labels: - app: bitlbee -spec: - type: LoadBalancer - selector: - app: bitlbee - ports: - - port: 6697 - targetPort: 6697 - name: irc-tls diff --git a/bitlbee/bitlbee.conf b/bitlbee/bitlbee.conf deleted file mode 100644 index 0903a991c..000000000 --- a/bitlbee/bitlbee.conf +++ /dev/null @@ -1,11 +0,0 @@ -[settings] -User = bitlbee -HostName = bitlbee.tazj.in -ConfigDir = /var/lib/bitlbee - -AuthMode = Closed -AuthPassword = md5:sehKBm6gtplh6/K0Dn6DOo0crlRH -OperPassword = md5:lP81y2wzU5pSwOtTEI37ewrSSlda - -[defaults] -private = 1 diff --git a/bitlbee/motd.txt b/bitlbee/motd.txt deleted file mode 100644 index 98d8c37d9..000000000 --- a/bitlbee/motd.txt +++ /dev/null @@ -1,6 +0,0 @@ -Welcome to tazjin's bitlbee server! - -While this server may appear as if it's open to the public, you are in no way -safe from me reading your communication or randomly terminating the service. - -Use at your own peril, unless you are me. diff --git a/bitlbee/stunnel.conf b/bitlbee/stunnel.conf deleted file mode 100644 index 4f1b3011c..000000000 --- a/bitlbee/stunnel.conf +++ /dev/null @@ -1,9 +0,0 @@ -setuid = nobody -setgid = nogroup -foreground = yes - -[bitlbee] -accept = 6697 -connect = 6667 -cert = /etc/bitlbee/tls/tls.crt -key = /etc/bitlbee/tls/tls.key diff --git a/gogs/gogs-rc.yaml b/gogs/gogs-rc.yaml deleted file mode 100644 index cf23de863..000000000 --- a/gogs/gogs-rc.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: v1 -kind: ReplicationController -metadata: - name: gogs -spec: - replicas: 1 - selector: - app: gogs - template: - metadata: - labels: - app: gogs - spec: - containers: - - image: gogs/gogs - imagePullPolicy: Always - name: gogs - ports: - - containerPort: 22 - - containerPort: 3000 - volumeMounts: - - name: gogs-storage - mountPath: /data - volumes: - - name: gogs-storage - gcePersistentDisk: - pdName: gogs-storage - fsType: ext4 diff --git a/gogs/gogs-svc.yaml b/gogs/gogs-svc.yaml deleted file mode 100644 index 89b1287d3..000000000 --- a/gogs/gogs-svc.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: gogs-priv - labels: - app: gogs -spec: - selector: - app: gogs - ports: - - port: 3000 - name: gogs-http-internal - - port: 22 - name: gogs-ssh-internal diff --git a/nginx/conf/http.conf b/nginx/conf/http.conf deleted file mode 100644 index ad03bec1b..000000000 --- a/nginx/conf/http.conf +++ /dev/null @@ -1,54 +0,0 @@ -# Default TLS redirect -server { - listen 80; - server_name *.tazj.in tazj.in; - return 301 https://$server_name$request_uri; -} - -# Simple IP echo thing -server { - listen 80; - listen 443 ssl http2; - server_name ip.tazj.in; - access_log off; - add_header "Content-Type" "text/plain"; - return 200 "$remote_addr\n"; -} - -# Redirect for oslo.pub -server { - listen 80; - listen 443 ssl; - server_name oslo.pub *.oslo.pub; - return 302 https://www.google.com/maps/d/viewer?mid=1pJIYY9cuEdt9DuMTbb4etBVq7hs; -} - -# Gogs web interface -server { - listen 443 ssl http2; - server_name git.tazj.in; - - location / { - proxy_pass http://gogs-priv.default.svc.cluster.local:3000; - } -} - -# tazj.in -> www.tazj.in -server { - listen 443 ssl http2; - server_name tazj.in; - - location / { - return 301 https://www.tazj.in$request_uri; - } -} - -# TazBlog -server { - listen 443 ssl http2 default_server; - server_name www.tazj.in default; - - location / { - proxy_pass http://tazblog-priv.default.svc.cluster.local/; - } -} diff --git a/nginx/conf/main.conf b/nginx/conf/main.conf deleted file mode 100644 index d5618545b..000000000 --- a/nginx/conf/main.conf +++ /dev/null @@ -1,64 +0,0 @@ -user nginx; -worker_processes 1; -daemon off; - -error_log /var/log/nginx/error.log warn; -pid /var/run/nginx.pid; - -events { - worker_connections 1024; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - sendfile on; - - keepalive_timeout 65; - gzip on; - - # Modern SSL config - ssl_protocols TLSv1.2; - ssl_ciphers 'ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256'; - ssl_prefer_server_ciphers on; - ssl_session_timeout 1d; - ssl_session_cache shared:HTTPS:50m; - ssl_session_tickets off; - ssl_dhparam /etc/nginx/ssl/dhparam/tls.dhparam; - - # Logstash log format - log_format logstash '$http_host ' - '$remote_addr [$time_local] ' - '"$request" $status $body_bytes_sent ' - '"$http_referer" "$http_user_agent" ' - '$request_time ' - '$upstream_response_time'; - - access_log /var/log/nginx/access.log logstash; - - # Default tazj.in config (certs need to be overriden for other stuff, like oslo.pub) - ssl_certificate /etc/nginx/ssl/tazj.in/fullchain.pem; - ssl_certificate_key /etc/nginx/ssl/tazj.in/key.pem; - - # HSTS (ngx_http_headers_module is required) (15768000 seconds = 6 months) - add_header Strict-Transport-Security max-age=15768000; - - include /etc/nginx/conf/http.conf; -} - -stream { - ssl_protocols TLSv1.2; - ssl_ciphers 'ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256'; - ssl_dhparam /etc/nginx/ssl/dhparam/tls.dhparam; - ssl_prefer_server_ciphers on; - ssl_session_timeout 1d; - ssl_session_cache shared:STREAM:50m; - ssl_session_tickets off; - - # Default tazj.in certificate - ssl_certificate /etc/nginx/ssl/tazj.in/fullchain.pem; - ssl_certificate_key /etc/nginx/ssl/tazj.in/key.pem; - - include /etc/nginx/conf/stream.conf; -} diff --git a/nginx/conf/stream.conf b/nginx/conf/stream.conf deleted file mode 100644 index 3fa02fdcf..000000000 --- a/nginx/conf/stream.conf +++ /dev/null @@ -1,12 +0,0 @@ -# Gogs SSH tunneling -server { - listen 22; - proxy_pass gogs-priv.default.svc.cluster.local:22; -} - -# Quassel TLS -> TCP tunneling -server { - # listen 4242 ssl; - listen 4242; - proxy_pass quassel-priv.default.svc.cluster.local:4242; -} diff --git a/nginx/generate-dhparam b/nginx/generate-dhparam deleted file mode 100755 index ef923cc7f..000000000 --- a/nginx/generate-dhparam +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -readonly dhparam=$(openssl dhparam 2048 | base64 -w0) - -echo "Inserting new DH parameter ..." -kubectl replace --force -f - < - -# Install Quassel server packages -RUN apk update && apk add quassel-core qt-sqlite icu-libs - -# Location for mounting Quassel state and configuration volume -VOLUME /var/lib/quassel - -EXPOSE 4242 -USER quassel - -CMD /usr/bin/quasselcore diff --git a/quassel/quassel-rc.yaml b/quassel/quassel-rc.yaml deleted file mode 100644 index f3586c0aa..000000000 --- a/quassel/quassel-rc.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: v1 -kind: ReplicationController -metadata: - name: quassel -spec: - replicas: 1 - selector: - app: quassel - template: - metadata: - labels: - app: quassel - spec: - containers: - - image: eu.gcr.io/composite-watch-759/quassel - imagePullPolicy: Always - name: quassel - ports: - - containerPort: 4242 - volumeMounts: - - name: quassel-storage - mountPath: /var/lib/quassel - volumes: - - name: quassel-storage - gcePersistentDisk: - pdName: quassel-storage - fsType: ext4 diff --git a/quassel/quassel-svc.yaml b/quassel/quassel-svc.yaml deleted file mode 100644 index 98d8b8e20..000000000 --- a/quassel/quassel-svc.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: quassel-priv - labels: - app: quassel -spec: - selector: - app: quassel - ports: - - port: 4242 - name: quassel-internal diff --git a/quassel/stunnel.conf b/quassel/stunnel.conf deleted file mode 100644 index 3c29e7890..000000000 --- a/quassel/stunnel.conf +++ /dev/null @@ -1,16 +0,0 @@ -; stunnel configuration for quassel tunnel - -; global configuration -setuid = stunnel -setgid = stunnel -;pid = /var/run/stunnel.pid -output = /var/log/stunnel.log - -; clients -[quassel-tazjin] -client = yes -accept = 127.0.0.1:4242 -connect = irc.tazj.in:4242 -verify = 2 -CApath = /etc/ssl/certs -checkHost = irc.tazj.in diff --git a/tazblog/tazblog-db.yaml b/tazblog/tazblog-db.yaml deleted file mode 100644 index b9d8fb104..000000000 --- a/tazblog/tazblog-db.yaml +++ /dev/null @@ -1,36 +0,0 @@ ---- -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: tazblog-db -spec: - template: - metadata: - labels: - app: tazblog-db - spec: - containers: - - image: eu.gcr.io/composite-watch-759/tazblog-haskell:f33723a - name: tazblog-db - command: ["tazblog-db"] - volumeMounts: - - name: tazblog-state - mountPath: /var/tazblog - volumes: - - name: tazblog-state - gcePersistentDisk: - pdName: tazblog-state - fsType: ext4 ---- -apiVersion: v1 -kind: Service -metadata: - name: tazblog-db - labels: - app: tazblog-db -spec: - selector: - app: tazblog-db - ports: - - port: 8070 - name: tazblog-db diff --git a/tazblog/tazblog.yaml b/tazblog/tazblog.yaml deleted file mode 100644 index 35275dadd..000000000 --- a/tazblog/tazblog.yaml +++ /dev/null @@ -1,33 +0,0 @@ ---- -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: tazblog -spec: - replicas: 2 - template: - metadata: - labels: - app: tazblog - spec: - containers: - - image: eu.gcr.io/composite-watch-759/tazblog-haskell:f33723a - imagePullPolicy: Always - name: tazblog - command: ["tazblog", "--dbHost", "tazblog-db.default.svc.cluster.local"] ---- -apiVersion: v1 -kind: Service -metadata: - name: tazblog-priv - labels: - app: tazblog - annotations: - acme/certificate: "www.tazj.in" -spec: - selector: - app: tazblog - ports: - - port: 80 - targetPort: 8000 - name: tazblog-http