update

7 files changed, 25 insertions, 10 deletions

diff --git a/terminaldweller.com/cgit/authorized_keys b/terminaldweller.com/cgit/authorized_keys
new file mode 100644
index 0000000..8bd899d
--- /dev/null
+++ b/terminaldweller.com/cgit/authorized_keys
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCv7DZhAcOd6MELOY/6gDfdm8RxE29m0kygA50CtXc10Viza54UT5zaCmQ4AFPUztC8zZYR/dqVkxPox443qfbC+N+KJ4prlKZOGOlVVJp+b4EgByQ2VDAQqbuE5rLqsETglgH5IfYct5WiO4DpZ3Ta+w+AkTZYgsVHCdN7i3dQBSGMVvdNxSrLgB5Dr1xTp0qQDM5J+4F8yqWohCSsChX+jGrY04bLYXzYvwVg9O4TB685izT/3YpmFAdN3PJsWt1VaSlYbe03Dn5kxOedX4mK51fkwD+qIlQ2EaFPNjpYYb4ecRKYIPx+0PwcPgEbkiuvBGCaAz9sD231IDJZhZWWkyb9PlgCI3FQh05N/ycbb4Uhe1vKq3rISbscfjK2ZBGVsrammbimihD/SzTisKMfiRhNi2vNgOn1p6ss7TAmpOaub8EfUBvpy5zaTn4ImbnD7QWWDeMrxfiV7TWczqmryPn+IMjlVR+PZIUnF3v+ki8BosA2/FpQmH5krAYuP+SbxtQx7i8VUCkTPQkjkj6Ts270Kf04hNi8RCSTQUV4KbXf96Az4Q2Vpjl1sa0wbrWOITt+nYkYQk+kuOxMdnbWScmC8kZShSzGR4bcvmk4P7ALWy2QW9iwGUCCqDzZPScQV0eLlQfyVHQyOebeiHHbQJ/3ln4tJijsBRYY0/6nsw== devi@DeviBox
diff --git a/terminaldweller.com/cgit/bootstrap/Dockerfile b/terminaldweller.com/cgit/bootstrap/Dockerfile
index be4f278..a1c2ea8 100644
--- a/terminaldweller.com/cgit/bootstrap/Dockerfile
+++ b/terminaldweller.com/cgit/bootstrap/Dockerfile
@@ -4,7 +4,7 @@ RUN apk update && apk add --no-cache git apk-cron
 # RUN rc-service crond start && rc-update add crond
 COPY ./bootstrap.sh /bootstrap.sh 
 COPY ./docker-entrypoint.sh /docker-entrypoint.sh
-COPY ./cron /etc/periodic/15min/cron
+COPY ./cron /etc/periodic/daily/cron
 # COPY ./crontab /etc/crontabs/root
 # RUN chmod 0744 /bootstrap.sh
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/terminaldweller.com/cgit/cgit/Dockerfile b/terminaldweller.com/cgit/cgit/Dockerfile
index 7ef7134..be2e5ef 100644
--- a/terminaldweller.com/cgit/cgit/Dockerfile
+++ b/terminaldweller.com/cgit/cgit/Dockerfile
@@ -3,3 +3,4 @@ RUN apk add && apk add --no-cache python3 py3-pip
 RUN pip3 install pygments
 RUN pip3 install md2html
 RUN pip3 install markdown
+RUN mkdir -p /cgit_cache/ && chown git:git /cgit_cache
diff --git a/terminaldweller.com/cgit/cgit/cgitrc b/terminaldweller.com/cgit/cgit/cgitrc
index 90abd90..a4944e9 100644
--- a/terminaldweller.com/cgit/cgit/cgitrc
+++ b/terminaldweller.com/cgit/cgit/cgitrc
@@ -5,6 +5,7 @@
 # Enable caching of up to 1000 output entries
 # cache-size=100
 
+cache-root=/cgit_cache
 ## ttl for root page
 cache-root-ttl=5
 
@@ -62,7 +63,7 @@ max-stats=year
 local-time=1
 
 root-title=cGit
-root-desc=Keep ALL the stuff in VERSION CONTROL!!
+root-desc=terminaldweller's personal git
 root-readme=/var/www/about.html
 # footer=/var/www/footer.html
 
@@ -84,7 +85,7 @@ about-filter=/usr/lib/cgit/filters/about-formatting.sh
 snapshots=tar.gz zip
 
 # Specify some default clone urls using macro expansion
-clone-url=ssh://git@hostname.local:64822~repositories/$CGIT_REPO_URL git@hostname.local:/home/git/repositories/$CGIT_REPO_URL
+clone-url=https://git.terminaldweller.com/$CGIT_REPO_URL ssh://git@git.terminaldweller.com/$CGIT_REPO_URL git@git.terminaldweller.com:$CGIT_REPO_URL
 
 ##
 ## List of common mimetypes
diff --git a/terminaldweller.com/cgit/docker-compose.yaml b/terminaldweller.com/cgit/docker-compose.yaml
index 3fe10ae..f1344f5 100644
--- a/terminaldweller.com/cgit/docker-compose.yaml
+++ b/terminaldweller.com/cgit/docker-compose.yaml
@@ -8,12 +8,13 @@ services:
       - cgitnet
     ports:
       - "127.0.0.1:8041:80"
-      - "127.0.0.1:8042:22"
+      - "8042:22"
       - "8043:443"
     restart: unless-stopped
     environment:
       - PGID=1000
       - PUID=1000
+      - PYGMENTIZE_STYLE=paraiso-dark
     volumes:
       - ./cgit/cgitrc:/etc/cgitrc:ro
       - storage:/home/git/repositories
@@ -23,6 +24,8 @@ services:
       # - /etc/localtime:/etc/localtime:ro
       - ./cgit.conf:/etc/lighttpd/cgit.conf:ro
       - /etc/letsencrypt/archive/git.terminaldweller.com/:/etc/certs/:ro
+      - cache:/cgit_cache
+      - ./authorized_keys:/home/git/.ssh/authorized_keys
   bootstrap:
     image: bootstrap
     build:
@@ -34,14 +37,15 @@ services:
     entrypoint: ["/docker-entrypoint.sh"]
       # cap_drop:
       # - ALL
-    healthcheck:
-      test: exit 1
-      interval: 1d
-      timeout: 10s
-      retries: 1
+      # healthcheck:
+      # test: exit 1
+      # interval: 1d
+      # timeout: 10s
+      # retries: 1
     restart: unless-stopped
 networks:
   cgitnet:
   bootstrapnet:
 volumes:
   storage:
+  cache:
diff --git a/terminaldweller.com/ejabberd/docker-compose.yaml b/terminaldweller.com/ejabberd/docker-compose.yaml
index f01085d..cbc9377 100644
--- a/terminaldweller.com/ejabberd/docker-compose.yaml
+++ b/terminaldweller.com/ejabberd/docker-compose.yaml
@@ -9,7 +9,7 @@ services:
       - "5222:5222"
       - "5223:5223"
       - "5269:5269"
-      - "5280:5280"
+      - "5270:5270"
       - "5443:5443"
       #- "1883:1883"
       #- "127.0.0.1:5080:5080"
diff --git a/terminaldweller.com/ejabberd/ejabberd.yml b/terminaldweller.com/ejabberd/ejabberd.yml
index fb5a6a9..5072841 100644
--- a/terminaldweller.com/ejabberd/ejabberd.yml
+++ b/terminaldweller.com/ejabberd/ejabberd.yml
@@ -66,6 +66,14 @@ listen:
     ip: '0.0.0.0'
     module: ejabberd_s2s_in
     max_stanza_size: 524288
+  - port: 5270
+    ip: '0.0.0.0'
+    module: ejabberd_s2s_in
+    max_stanza_size: 524288
+    protocol_options: 'TLS_OPTIONS'
+    ciphers: 'TLS_CIPHERS'
+    dhfile: 'DH_FILE'
+    tls: true
   - port: 5443
     ip: '0.0.0.0'
     module: ejabberd_http