testing

Vagrantfile

@@ -20,7 +20,7 @@ else
 end
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "debian/contrib-buster64"
+  config.vm.box = "debian/bullseye64"
   config.vm.network "private_network", type: "dhcp"
   config.vm.synced_folder ".", "/vagrant", disabled: true
   config.vm.synced_folder "./scratch", "/vagrant/scratch"

dev/host_vars/jekyll.yml

@@ -0,0 +1,27 @@
+# base
+allow_reboot: false
+manage_network: false
+
+# docker
+docker_users:
+  - vagrant
+
+# traefik
+traefik_version: latest
+traefik_dashboard: true
+traefik_domain: traefik.vm.krislamo.org
+traefik_auth: admin:$apr1$T1l.BCFz$Jyg8msXYEAUi3LLH39I9d1 # admin:admin
+#traefik_acme_email: realemail@example.com # Let's Encrypt settings
+#traefik_production: true
+
+# jekyll
+jekyll_project: example
+jekyll_repo_url: https://git.krislamo.org/kris/example-jekyll/
+jekyll_repo_branch: master
+
+# nginx
+nginx_domain: nginx.vm.krislamo.org
+nginx_name: staticsite
+nginx_repo_url: https://git.krislamo.org/kris/example-website/
+nginx_auth: admin:$apr1$T1l.BCFz$Jyg8msXYEAUi3LLH39I9d1 # admin:admin
+nginx_version: latest

dev/jekyll.yml

@@ -0,0 +1,11 @@
+- name: Install Jekyll server
+  hosts: all
+  become: true
+  vars_files:
+    - host_vars/jekyll.yml
+  roles:
+    - base
+    - docker
+    #- traefik
+    - jekyll
+    #- nginx

dockerbox.yml

@@ -20,7 +20,7 @@
     - docker
     - traefik
     - nextcloud
-#    - gitea
+    - gitea
     - jenkins
     - prometheus
     - nginx

roles/nginx/tasks/main.yml

@@ -29,7 +29,7 @@
       - "{{ nginx_html }}:/usr/share/nginx/html:ro"
     labels:
       traefik.http.routers.nginx.rule: "Host(`{{ nginx_domain }}`)"
-      #traefik.http.middlewares.nginxauth.basicauth.users: "{{ nginx_auth }}"
+      traefik.http.middlewares.nginxauth.basicauth.users: "{{ nginx_auth }}"
       traefik.http.routers.nginx.entrypoints: websecure
       traefik.http.routers.nginx.tls.certresolver: letsencrypt
       traefik.http.routers.nginx.middlewares: "securehttps@file,nginxauth"

roles/traefik/tasks/main.yml

@@ -41,7 +41,7 @@
       - name: traefik
     labels:
       traefik.http.routers.traefik.rule: "Host(`{{ traefik_domain }}`)"
-      #traefik.http.middlewares.auth.basicauth.users: "{{ traefik_auth }}"
+      traefik.http.middlewares.auth.basicauth.users: "{{ traefik_auth }}"
       traefik.http.middlewares.localonly.ipwhitelist.sourcerange: "{{ traefik_localonly }}"
       traefik.http.routers.traefik.tls.certresolver: letsencrypt
       traefik.http.routers.traefik.middlewares: "securehttps@file,auth@docker,localonly"