Add .vscode to .gitignore

.gitignore

@@ -1,4 +1,5 @@
 .vagrant
+.vscode
 .playbook
 /*.yml
 /*.yaml

Vagrantfile

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

dev/bitwarden.yml

@@ -5,6 +5,6 @@
     - host_vars/bitwarden.yml
   roles:
     - base
-    - proxy
     - docker
+    - traefik
     - bitwarden

dev/host_vars/bitwarden.yml

@@ -2,9 +2,6 @@
 allow_reboot: false
 manage_network: false
 
-# nginx proxy
-proxy: helloworld
-
 # docker
 docker_users:
   - vagrant
@@ -16,9 +13,6 @@ 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
-traefik_ports:
-  - "8000:80"
-  - "4430:443"
 
 # bitwarden
 # Get Installation ID & Key at https://bitwarden.com/host/

dockerbox.yml

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

roles/.gitignore

@@ -11,7 +11,6 @@
 !nextcloud*/
 !nginx*/
 !prometheus*/
-!proxy/*
 !rsnapshot*/
 !traefik*/
 !unifi*/

roles/gitea/tasks/main.yml

@@ -47,7 +47,6 @@
     labels:
       traefik.http.routers.gitea.rule: "Host(`{{ gitea_domain }}`)"
       traefik.http.routers.gitea.entrypoints: websecure
-      traefik.http.routers.gitea.tls.certresolver: letsencrypt
       traefik.http.routers.gitea.middlewares: "securehttps@file"
       traefik.http.services.gitea.loadbalancer.server.port: "3000"
       traefik.docker.network: traefik

roles/jenkins/tasks/server.yml

@@ -20,7 +20,6 @@
     labels:
       traefik.http.routers.jenkins.rule: "Host(`{{ jenkins_domain }}`)"
       traefik.http.routers.jenkins.entrypoints: websecure
-      traefik.http.routers.jenkins.tls.certresolver: letsencrypt
       traefik.http.routers.jenkins.middlewares: "securehttps@file"
       traefik.docker.network: traefik
       traefik.enable: "true"

roles/nextcloud/tasks/main.yml

@@ -32,7 +32,6 @@
     labels:
       traefik.http.routers.nextcloud.rule: "Host(`{{ nextcloud_domain }}`)"
       traefik.http.routers.nextcloud.entrypoints: websecure
-      traefik.http.routers.nextcloud.tls.certresolver: letsencrypt
       traefik.http.routers.nextcloud.middlewares: "securehttps@file,nextcloud-webdav"
       traefik.http.middlewares.nextcloud-webdav.redirectregex.regex: "https://(.*)/.well-known/(card|cal)dav"
       traefik.http.middlewares.nextcloud-webdav.redirectregex.replacement: "https://${1}/remote.php/dav/"

roles/nginx/tasks/main.yml

@@ -1,7 +1,36 @@
-- import_tasks: proxy.yml
-  tags: proxy
-  when: proxy is defined
+- name: Create nginx root
+  file:
+    path: "{{ nginx_root }}"
+    state: directory
 
-- import_tasks: webserver.yml
-  tags: nginx
-  when: nginx_domain is defined
+- name: Generate deploy keys
+  openssh_keypair:
+    path: "{{ nginx_repo_key }}"
+    state: present
+
+- name: Clone static website files
+  git:
+    repo: "{{ nginx_repo_url }}"
+    dest: "{{ nginx_html }}"
+    version: "{{ nginx_repo_branch }}"
+    key_file: "{{ nginx_repo_key }}"
+    separate_git_dir: "{{ nginx_repo_dest }}"
+
+- name: Start nginx container
+  docker_container:
+    name: "{{ nginx_name }}"
+    image: nginx:{{ nginx_version }}
+    state: started
+    restart_policy: always
+    networks_cli_compatible: true
+    networks:
+      - name: traefik
+    volumes:
+      - "{{ 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.routers.nginx.entrypoints: websecure
+      traefik.http.routers.nginx.middlewares: "securehttps@file"
+      traefik.docker.network: traefik
+      traefik.enable: "true"

roles/nginx/tasks/proxy.yml

@@ -1,17 +0,0 @@
-- name: Install nginx
-  apt:
-    name: nginx
-    state: present
-
-- name: Install nginx configuration
-  template:
-    src: nginx.conf.j2
-    dest: /etc/nginx/nginx.conf
-    mode: '0644'
-  register: nginx_conf
-
-- name: Reload nginx
-  service:
-    name: nginx
-    state: reloaded
-    enabled: true

roles/nginx/tasks/webserver.yml

@@ -1,37 +0,0 @@
-- name: Create nginx root
-  file:
-    path: "{{ nginx_root }}"
-    state: directory
-
-- name: Generate deploy keys
-  openssh_keypair:
-    path: "{{ nginx_repo_key }}"
-    state: present
-
-- name: Clone static website files
-  git:
-    repo: "{{ nginx_repo_url }}"
-    dest: "{{ nginx_html }}"
-    version: "{{ nginx_repo_branch }}"
-    key_file: "{{ nginx_repo_key }}"
-    separate_git_dir: "{{ nginx_repo_dest }}"
-
-- name: Start nginx container
-  docker_container:
-    name: "{{ nginx_name }}"
-    image: nginx:{{ nginx_version }}
-    state: started
-    restart_policy: always
-    networks_cli_compatible: true
-    networks:
-      - name: traefik
-    volumes:
-      - "{{ 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.routers.nginx.entrypoints: websecure
-      traefik.http.routers.nginx.tls.certresolver: letsencrypt
-      traefik.http.routers.nginx.middlewares: "securehttps@file,nginxauth"
-      traefik.docker.network: traefik
-      traefik.enable: "true"

roles/nginx/templates/nginx.conf.j2

@@ -1,45 +0,0 @@
-user www-data;
-worker_processes auto;
-pid /run/nginx.pid;
-include /etc/nginx/modules-enabled/*.conf;
-
-events {
-  worker_connections 1024;
-}
-
-http {
-    include       /etc/nginx/mime.types;
-    default_type  application/octet-stream;
-    log_format    main  '$remote_addr - $remote_user [$time_local] "$request" '
-                        '$status $body_bytes_sent "$http_referer" '
-                        '"$http_user_agent" "$http_x_forwarded_for"';
-
-    access_log  /var/log/nginx/access.log  main;
-    sendfile        on;
-    #tcp_nopush     on;
-    keepalive_timeout  65;
-    #gzip  on;
-
-    include /etc/nginx/conf.d/*.conf;
-}
-
-## tcp LB  and SSL passthrough for backend ##
-stream {
-    upstream traefik {
-        server 127.0.0.1:4430 max_fails=3 fail_timeout=10s;
-    }
-
-log_format basic '$remote_addr [$time_local] '
-                 '$protocol $status $bytes_sent $bytes_received '
-                 '$session_time "$upstream_addr" '
-                 '"$upstream_bytes_sent" "$upstream_bytes_received" "$upstream_connect_time"';
-
-    access_log /var/log/nginx/traefik_access.log basic;
-    error_log  /var/log/nginx/traefik_error.log;
-
-    server {
-        listen 443;
-        proxy_pass traefik;
-        proxy_next_upstream on;
-    }
-}

roles/prometheus/tasks/main.yml

@@ -45,7 +45,6 @@
       traefik.http.routers.prometheus.rule: "Host(`{{ prom_domain }}`)"
       traefik.http.routers.prometheus.entrypoints: websecure
       traefik.http.routers.prometheus.middlewares: "securehttps@file,localonly"
-      traefik.http.routers.prometheus.tls.certresolver: letsencrypt
       traefik.http.middlewares.localonly.ipwhitelist.sourcerange: "{{ traefik_localonly }}"
       traefik.docker.network: traefik
       traefik.enable: "true"
@@ -65,7 +64,6 @@
     labels:
       traefik.http.routers.grafana.rule: "Host(`{{ grafana_domain }}`)"
       traefik.http.routers.grafana.entrypoints: websecure
-      traefik.http.routers.grafana.tls.certresolver: letsencrypt
       traefik.http.routers.grafana.middlewares: "securehttps@file"
       traefik.docker.network: traefik
       traefik.enable: "true"

roles/proxy/handlers/main.yml

@@ -1,5 +0,0 @@
-- name: Reload nginx
-  service:
-    name: nginx
-    state: reloaded
-  listen: reload_nginx

roles/proxy/tasks/main.yml

@@ -1,12 +0,0 @@
-- name: Install nginx
-  apt:
-    name: nginx
-    state: present
-    update_cache: true
-
-- name: Install nginx configuration
-  template:
-    src: nginx.conf.j2
-    dest: /etc/nginx/nginx.conf
-    mode: '0644'
-  notify: reload_nginx

roles/traefik/tasks/main.yml

@@ -41,10 +41,9 @@
       - name: traefik
     labels:
       traefik.http.routers.traefik.rule: "Host(`{{ traefik_domain }}`)"
-      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"
+      #traefik.http.middlewares.auth.basicauth.users: "{{ traefik_auth }}"
+      #traefik.http.middlewares.localonly.ipwhitelist.sourcerange: "{{ traefik_localonly }}"
+      traefik.http.routers.traefik.middlewares: "securehttps@file"
       traefik.http.routers.traefik.service: "api@internal"
       traefik.http.routers.traefik.entrypoints: websecure
       traefik.http.routers.traefik.tls: "true"