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/bitwarden.yml

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

dev/host_vars/bitwarden.yml

@@ -2,6 +2,9 @@
 allow_reboot: false
 manage_network: false
 
+# nginx proxy
+proxy: helloworld
+
 # docker
 docker_users:
   - vagrant
@@ -13,6 +16,9 @@ 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/

roles/.gitignore

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

roles/nginx/tasks/main.yml

@@ -1,37 +1,7 @@
-- name: Create nginx root
+- import_tasks: proxy.yml
-  file:
+  tags: proxy
-    path: "{{ nginx_root }}"
+  when: proxy is defined
-    state: directory
 
-- name: Generate deploy keys
+- import_tasks: webserver.yml
-  openssh_keypair:
+  tags: nginx
-    path: "{{ nginx_repo_key }}"
+  when: nginx_domain is defined
-    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/tasks/proxy.yml

@@ -0,0 +1,17 @@
+- 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

@@ -0,0 +1,37 @@
+- 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

@@ -0,0 +1,45 @@
+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/proxy/handlers/main.yml

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

roles/proxy/tasks/main.yml

@@ -0,0 +1,12 @@
+- 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