From 32443009043c99de764ed9fb071ec5975186032b Mon Sep 17 00:00:00 2001
From: Stanislaw Adaszewski <s.adaszewski@gmail.com>
Date: Thu, 21 May 2020 17:46:51 +0200
Subject: [PATCH] Regroup the gitea example.

---
 example/gitea/focker-compose.yml              | 24 ++++---------------
 example/{ => gitea}/gitea-custom/Fockerfile   |  0
 .../gitea-custom/files/body_inner_pre.tmpl    |  0
 .../{ => gitea}/gitea-custom/files/custom.css |  0
 .../gitea-custom/files/header.tmpl            |  0
 .../gitea-custom/files/secrets.ini            |  0
 example/{ => gitea}/gitea-disable/Fockerfile  |  0
 .../{ => gitea}/gitea-disable/files/403.html  |  0
 .../gitea-disable/files/nginx.conf            |  0
 example/gitea/{ => gitea-latest}/Fockerfile   |  0
 example/{ => gitea}/gitea-logo/Fockerfile     |  0
 .../{ => gitea}/gitea-logo/files/resize.py    |  0
 12 files changed, 4 insertions(+), 20 deletions(-)
 rename example/{ => gitea}/gitea-custom/Fockerfile (100%)
 rename example/{ => gitea}/gitea-custom/files/body_inner_pre.tmpl (100%)
 rename example/{ => gitea}/gitea-custom/files/custom.css (100%)
 rename example/{ => gitea}/gitea-custom/files/header.tmpl (100%)
 rename example/{ => gitea}/gitea-custom/files/secrets.ini (100%)
 rename example/{ => gitea}/gitea-disable/Fockerfile (100%)
 rename example/{ => gitea}/gitea-disable/files/403.html (100%)
 rename example/{ => gitea}/gitea-disable/files/nginx.conf (100%)
 rename example/gitea/{ => gitea-latest}/Fockerfile (100%)
 rename example/{ => gitea}/gitea-logo/Fockerfile (100%)
 rename example/{ => gitea}/gitea-logo/files/resize.py (100%)

diff --git a/example/gitea/focker-compose.yml b/example/gitea/focker-compose.yml
index ee0f569..3012e28 100644
--- a/example/gitea/focker-compose.yml
+++ b/example/gitea/focker-compose.yml
@@ -1,9 +1,8 @@
 images:
-  gitea: .
-  gitea-logo: ../gitea-logo
-  gitea-custom: ../gitea-custom
-  gitea-disable: ../gitea-disable
-  certbot-latest: ../certbot
+  gitea-latest: ./gitea-latest
+  gitea-logo: ./gitea-logo
+  gitea-custom: ./gitea-custom
+  gitea-disable: ./gitea-disable
 
 volumes:
   gitea-data:
@@ -11,8 +10,6 @@ volumes:
     chown: 211:211
     zfs:
       quota: 5G
-  certbot-webroot: {}
-  certbot-config-gitea: {}
 
 jails:
   gitea:
@@ -39,16 +36,3 @@ jails:
         su git -c 'gitea admin -c $GITEA_CONF create-user --username admin1 --password "AdminAdmin1+" --email "invaliduser@nonexistentdomain.com" --admin'; \
       fi && \
       /bin/sh /etc/rc
-
-  certbot-gitea:
-    image: certbot-latest
-    mounts:
-      certbot-webroot: /certbot/webroot
-      certbot-config-gitea: /usr/local/etc/letsencrypt
-    ip4.addr: 127.0.9.1
-    exec.start: |
-      if [ ! -f /usr/local/etc/letsencrypt/cli.ini ]; then
-        echo 'webroot-path=/certbot/webroot' >>/usr/local/etc/letsencrypt/cli.ini && \
-        echo 'authenticator=webroot' >>/usr/local/etc/letsencrypt/cli.ini;
-      fi && \
-      /bin/sh /etc/rc
diff --git a/example/gitea-custom/Fockerfile b/example/gitea/gitea-custom/Fockerfile
similarity index 100%
rename from example/gitea-custom/Fockerfile
rename to example/gitea/gitea-custom/Fockerfile
diff --git a/example/gitea-custom/files/body_inner_pre.tmpl b/example/gitea/gitea-custom/files/body_inner_pre.tmpl
similarity index 100%
rename from example/gitea-custom/files/body_inner_pre.tmpl
rename to example/gitea/gitea-custom/files/body_inner_pre.tmpl
diff --git a/example/gitea-custom/files/custom.css b/example/gitea/gitea-custom/files/custom.css
similarity index 100%
rename from example/gitea-custom/files/custom.css
rename to example/gitea/gitea-custom/files/custom.css
diff --git a/example/gitea-custom/files/header.tmpl b/example/gitea/gitea-custom/files/header.tmpl
similarity index 100%
rename from example/gitea-custom/files/header.tmpl
rename to example/gitea/gitea-custom/files/header.tmpl
diff --git a/example/gitea-custom/files/secrets.ini b/example/gitea/gitea-custom/files/secrets.ini
similarity index 100%
rename from example/gitea-custom/files/secrets.ini
rename to example/gitea/gitea-custom/files/secrets.ini
diff --git a/example/gitea-disable/Fockerfile b/example/gitea/gitea-disable/Fockerfile
similarity index 100%
rename from example/gitea-disable/Fockerfile
rename to example/gitea/gitea-disable/Fockerfile
diff --git a/example/gitea-disable/files/403.html b/example/gitea/gitea-disable/files/403.html
similarity index 100%
rename from example/gitea-disable/files/403.html
rename to example/gitea/gitea-disable/files/403.html
diff --git a/example/gitea-disable/files/nginx.conf b/example/gitea/gitea-disable/files/nginx.conf
similarity index 100%
rename from example/gitea-disable/files/nginx.conf
rename to example/gitea/gitea-disable/files/nginx.conf
diff --git a/example/gitea/Fockerfile b/example/gitea/gitea-latest/Fockerfile
similarity index 100%
rename from example/gitea/Fockerfile
rename to example/gitea/gitea-latest/Fockerfile
diff --git a/example/gitea-logo/Fockerfile b/example/gitea/gitea-logo/Fockerfile
similarity index 100%
rename from example/gitea-logo/Fockerfile
rename to example/gitea/gitea-logo/Fockerfile
diff --git a/example/gitea-logo/files/resize.py b/example/gitea/gitea-logo/files/resize.py
similarity index 100%
rename from example/gitea-logo/files/resize.py
rename to example/gitea/gitea-logo/files/resize.py