testing

README.md

@@ -1,25 +1,39 @@
-# Project Moxie
+# Homelab
+This repository contains Ansible to automate Debian GNU/Linux servers, deploying
+server technologies that are either useful in a personal capacity or provide
+educational value on automating enterprise infrastructure.
 
-Project Moxie is a personal IT homelab project written in Ansible and executed by Jenkins. It is a growing collection of infrastructure as code (IaC) I write out of curiosity and for reference purposes, keeping a handful of beneficial projects managed and secured.
+Development is accomplished using Vagrant to allow easy reproducibility in an
+isolated virtual environment that be ran on your local machine.
 
 ## Quick Start
-
-To configure a local virtual machine for testing, follow these simple steps.
+These steps assume a basic understanding of GNU/Linux, Hypervisors, Vagrant, and Ansible.
 
 ### Prerequisites
-
-Vagrant and VirtualBox are used to develop Project Moxie. You will need to install these before continuing.
+- [Vagrant](https://developer.hashicorp.com/vagrant/docs/installation)
+- [Supported hypervisor](https://developer.hashicorp.com/vagrant/docs/providers)
+- Ansible
 
 ### Installation
 
 1. Clone this repository
    ```
-   git clone https://github.com/krislamo/moxie
+   git clone https://git.krislamo.org/kris/homelab
+   ```
+   OR download from the mirror on GitHub:
+   ```
+   git clone https://github.com/krislamo/homelab
    ```
-2. Set the `PLAYBOOK` environmental variable to a development playbook name in the `dev/` directory
 
-   The following `PLAYBOOK` names are available: `dockerbox`, `hypervisor`, `minecraft`, `bitwarden`, `nextcloud`, `nginx`
+2. Find available playbooks for development
+   ```
+   cd homelab
+   ```
+   ```
+   find dev -maxdepth 1 -name "*.yml" -exec basename {} .yml \;
+   ```
 
+3. Set the `PLAYBOOK` environmental variable to a value listed in the last step, e.g.,
    ```
    export PLAYBOOK=dockerbox
    ```
@@ -29,11 +43,10 @@ Vagrant and VirtualBox are used to develop Project Moxie. You will need to insta
    ```
 
 #### Copyright and License
-Copyright (C) 2020-2021  Kris Lamoureux
+Copyright (C) 2020-2022  Kris Lamoureux
 
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 
-
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 3 of the License.
 
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.

dev/dockerbox.yml

@@ -8,6 +8,7 @@
     - docker
     - traefik
     - nextcloud
+    - gitea
     - jenkins
     - prometheus
     - nginx

dev/host_vars/dockerbox.yml

@@ -13,7 +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_http_only: true # if behind reverse-proxy
 
 # nextcloud
 nextcloud_version: stable

roles/traefik/defaults/main.yml

@@ -1,18 +1,12 @@
-# Container settings
 traefik_name: traefik
-traefik_standalone: true
-traefik_http_only: false
-traefik_debug: false
-traefik_web_entry: "80:80"
-traefik_websecure_entry: "443:443"
+traefik_dashboard: false
+traefik_root: "/opt/{{ traefik_name }}"
 traefik_localonly: "10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, 127.0.0.0/8"
-
-# HTTPS settings
 traefik_production: false
 traefik_hsts_enable: false
 traefik_hsts_preload: false
 traefik_hsts_seconds: 0
-traefik_http_redirect: true
-
-# Host settings
-traefik_root: "{{ docker_compose_root }}/{{ traefik_name }}"
+traefik_http_redirect: false
+traefik_ports:
+  - "80:80"
+  - "443:443"

roles/traefik/handlers/main.yml

@@ -4,8 +4,11 @@
     state: touch
   listen: reload_traefik
 
-- name: Restart Traefik
-  service:
-    name: "{{ docker_compose_service }}@{{ traefik_name }}"
-    state: restarted
+- name: Restart Traefik container
+  docker_container:
+    name: "{{ traefik_name }}"
+    image: traefik:{{ traefik_version }}
+    state: started
+    container_default_behavior: "no_defaults"
+    restart: yes
   listen: restart_traefik

roles/traefik/tasks/main.yml

@@ -1,8 +1,14 @@
-- name: Create Traefik directories
+- name: Create Traefik configuration directories
   file:
     path: "{{ traefik_root }}/config/dynamic"
     state: directory
 
+- name: Install static Traefik configuration
+  template:
+    src: traefik.yml.j2
+    dest: "{{ traefik_root }}/config/traefik.yml"
+  notify: restart_traefik
+
 - name: Install dynamic security configuration
   template:
     src: security.yml.j2
@@ -19,26 +25,32 @@
   loop: "{{ traefik_external }}"
   when: traefik_external is defined
 
-- name: Install Traefik's docker-compose file
-  template:
-    src: docker-compose.yml.j2
-    dest: "{{ traefik_root }}/docker-compose.yml"
-  notify: restart_traefik
+- name: Create Traefik network
+  docker_network:
+    name: traefik
 
-- name: Install Traefik's docker-compose variables
-  template:
-    src: compose-env.j2
-    dest: "{{ traefik_root }}/.env"
-  notify: restart_traefik
-
-- name: Install static Traefik configuration
-  template:
-    src: traefik.yml.j2
-    dest: "{{ traefik_root }}/config/traefik.yml"
-  notify: restart_traefik
-
-- name: Start and enable Traefik service
-  service:
-    name: "{{ docker_compose_service }}@{{ traefik_name }}"
+- name: Start Traefik container
+  docker_container:
+    name: "{{ traefik_name }}"
+    image: traefik:{{ traefik_version }}
     state: started
-    enabled: true
+    restart_policy: always
+    ports: "{{ traefik_ports }}"
+    container_default_behavior: "no_defaults"
+    networks_cli_compatible: "false"
+    networks:
+      - 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.routers.traefik.service: "api@internal"
+      traefik.http.routers.traefik.entrypoints: websecure
+      traefik.http.routers.traefik.tls: "true"
+      traefik.docker.network: traefik
+      traefik.enable: "{{ traefik_dashboard | string }}"
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - "{{ traefik_root }}/config:/etc/traefik"

roles/traefik/templates/compose-env.j2

@@ -1,8 +0,0 @@
-# {{ ansible_managed }}
-traefik_version={{ traefik_version }}
-traefik_name={{ traefik_name }}
-traefik_domain={{ traefik_domain }}
-traefik_dashboard={{ traefik_dashboard | string | lower }}
-traefik_debug={{ traefik_debug | string | lower }}
-traefik_web_entry={{ traefik_web_entry }}
-traefik_websecure_entry={{ traefik_websecure_entry }}

roles/traefik/templates/docker-compose.yml.j2

@@ -1,25 +0,0 @@
-version: '3.7'
-
-networks:
-  traefik:
-    name: traefik
-
-services:
-  traefik:
-    image: "traefik:${traefik_version}"
-    container_name: "${traefik_name}"
-    ports:
-      - "${traefik_web_entry:-80:80}"
-{% if traefik_standalone and not traefik_http_only %}
-      - "${traefik_websecure_entry:-443:443}"
-{% endif %}
-    networks:
-      - traefik
-    labels:
-      - "traefik.http.routers.traefik.rule=Host(`{{ traefik_domain }}`)"
-      - "traefik.http.routers.traefik.service=api@internal"
-      - "traefik.docker.network=traefik"
-      - "traefik.enable=${traefik_dashboard:-false}"
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - "{{ traefik_root }}/config:/etc/traefik"

roles/traefik/templates/traefik.yml.j2

@@ -10,7 +10,7 @@ providers:
 entrypoints:
   web:
     address: ':80'
-{% if traefik_http_redirect is defined and traefik_http_redirect and not traefik_http_only %}
+{% if traefik_http_redirect is defined and traefik_http_redirect %}
     http:
       redirections:
         entrypoint:
@@ -18,12 +18,10 @@ entrypoints:
           scheme: https
           permanent: true
 {% endif %}
-{% if not traefik_http_only is defined or not traefik_http_only %}
   websecure:
     address: ':443'
     http:
       tls: {}
-{% endif %}
 
 {% if traefik_acme_email is defined %}
 certificatesResolvers: