Change nginx role to staticweb

.gitignore

@@ -1,4 +1,4 @@
 .playbook
-.vagrant
+.vagrant*
 .vscode
 /environments/

Vagrantfile

@@ -1,43 +1,45 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-SSH_FORWARD=ENV["SSH_FORWARD"]
+require 'yaml'
-if !(SSH_FORWARD == "true")
+settings_path = '.vagrant.yml'
-  SSH_FORWARD = false
+settings = {}
+
+if File.exist?(settings_path)
+  settings = YAML.load_file(settings_path)
 end
 
+VAGRANT_BOX  = settings['VAGRANT_BOX']  || 'debian/bookworm64'
+VAGRANT_CPUS = settings['VAGRANT_CPUS'] || 2
+VAGRANT_MEM  = settings['VAGRANT_MEM']  || 2048
+SSH_FORWARD  = settings['SSH_FORWARD']  || false
+
+# Default to shell environment variable: PLAYBOOK (priority #1)
 PLAYBOOK=ENV["PLAYBOOK"]
 if !PLAYBOOK
-  if File.exist?('.playbook')
+  # PLAYBOOK setting in .vagrant.yml (priority #2)
-    PLAYBOOK = IO.read('.playbook').split("\n")[0]
+  PLAYBOOK = settings['PLAYBOOK'] || false
-  end
-
   if !PLAYBOOK || PLAYBOOK.empty?
-    PLAYBOOK = "\nERROR: Set env PLAYBOOK"
+    puts "[VAGRANTFILE ERROR]: Set PLAYBOOK setting in .vagrant.yml"
+    abort
   end
-else
-  File.write(".playbook", PLAYBOOK)
 end
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "debian/bullseye64"
+  config.vm.box = VAGRANT_BOX
   config.vm.network "private_network", type: "dhcp"
-  config.vm.synced_folder ".", "/vagrant", disabled: true
-  config.vm.synced_folder "./scratch", "/vagrant/scratch"
   config.ssh.forward_agent = SSH_FORWARD
 
-  # Machine Name
+  # Libvrit provider
-  config.vm.define :moxie do |moxie| #
-  end
-
   config.vm.provider :libvirt do |libvirt|
-    libvirt.cpus = 2
+    libvirt.cpus   = VAGRANT_CPUS
-    libvirt.memory = 4096
+    libvirt.memory = VAGRANT_MEM
-    libvirt.default_prefix = ""
   end
 
-  config.vm.provider "virtualbox" do |vbox|
+  # Virtualbox provider
-    vbox.memory = 4096
+  config.vm.provider :virtualbox do |vbox|
+    vbox.cpus   = VAGRANT_CPUS
+    vbox.memory = VAGRANT_MEM
   end
 
   # Provision with Ansible
@@ -46,5 +48,4 @@ Vagrant.configure("2") do |config|
     ansible.compatibility_mode = "2.0"
     ansible.playbook = "dev/" + PLAYBOOK + ".yml"
   end
-
 end

dev/docker.yml

@@ -1,8 +0,0 @@
-- name: Install Docker Server
-  hosts: all
-  become: true
-  vars_files:
-    - host_vars/docker.yml
-  roles:
-    - base
-    - docker

dev/host_vars/docker.yml

@@ -1,13 +0,0 @@
-# base
-allow_reboot: false
-manage_network: false
-
-# docker
-docker_users:
-  - vagrant
-
-docker_compose_deploy:
-  - name: docs
-    url: git@git.krislamo.org:kris/homelab-docs.git
-    version: main
-    sync: true

dev/host_vars/staticweb.yml

@@ -14,7 +14,7 @@ traefik_auth: admin:$apr1$T1l.BCFz$Jyg8msXYEAUi3LLH39I9d1 # admin:admin
 #traefik_acme_email: realemail@example.com # Let's Encrypt settings
 #traefik_production: true
 
-# nginx
+# staticweb
 nginx_domain: nginx.vm.krislamo.org
 nginx_name: staticsite
 nginx_repo_url: https://git.krislamo.org/kris/example-website/

dev/staticweb.yml

@@ -1,10 +1,10 @@
-- name: Install nginx server (docker)
+- name: Install a static web container
   hosts: all
   become: true
   vars_files:
-    - host_vars/nginx.yml
+    - host_vars/staticweb.yml
   roles:
     - base
     - docker
     - traefik
-    - nginx
+    - staticweb

roles/docker/tasks/main.yml

@@ -53,21 +53,13 @@
   loop: "{{ docker_compose_deploy }}"
   when: docker_compose_deploy is defined
 
-- name: Copy docker-compose project directory
-  ansible.builtin.copy:
-    src: "{{ docker_repos_path }}/{{ item.name }}/"
-    dest: "{{ docker_compose_root }}/{{ item.name }}/"
-    remote_src: yes
-  loop: "{{ docker_compose_deploy }}"
-  when: docker_compose_deploy is defined and item.sync | default(false)
-
 - name: Copy docker-compose.yml files to their service directories
   ansible.builtin.copy:
     src: "{{ docker_repos_path }}/{{ item.name }}/{{ item.path | default('docker-compose.yml') }}"
     dest: "{{ docker_compose_root }}/{{ item.name }}/docker-compose.yml"
     remote_src: yes
   loop: "{{ docker_compose_deploy }}"
-  when: docker_compose_deploy is defined and not item.sync | default(false)
+  when: docker_compose_deploy is defined
 
 - name: Set environment variables for docker-compose projects
   ansible.builtin.template: