testing

.github/workflows/vagrant.yml

@@ -1,10 +1,6 @@
 name: homelab-ci
 
-on:
+on: [push]
-  push:
-    branches:
-      - main
-      - testing
 
 jobs:
   homelab-ci:

.gitignore

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

Vagrantfile

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

roles/docker/defaults/main.yml

@@ -1,6 +1,3 @@
 docker_compose_root: /var/lib/compose
-docker_compose_service: compose
 docker_compose: /usr/bin/docker-compose
-docker_repos_keys: "{{ docker_repos_path }}/.keys"
+docker_compose_service: compose
-docker_repos_keytype: rsa
-docker_repos_path: /srv/compose_repos

roles/docker/tasks/main.yml

@@ -17,58 +17,6 @@
     mode: 0400
   notify: compose_systemd
 
-- name: Create directories to clone docker-compose repositories
-  ansible.builtin.file:
-    path: "{{ item }}"
-    state: directory
-    mode: 0400
-  loop:
-    - "{{ docker_repos_path }}"
-    - "{{ docker_repos_keys }}"
-  when: docker_compose_deploy is defined
-
-- name: Generate OpenSSH deploy keys for docker-compose clones
-  community.crypto.openssh_keypair:
-    path: "{{ docker_repos_keys }}/id_{{ docker_repos_keytype }}"
-    type: "{{ docker_repos_keytype }}"
-    mode: 0400
-    state: present
-  when: docker_compose_deploy is defined
-
-- name: Clone external docker-compose projects
-  ansible.builtin.git:
-    repo: "{{ item.url }}"
-    dest: "{{ docker_repos_path }}/{{ item.name }}"
-    version: "{{ item.version | default('main') }}"
-    force: true
-    key_file: "{{ docker_repos_keys }}/id_{{ docker_repos_keytype }}"
-  when: docker_compose_deploy is defined
-  loop: "{{ docker_compose_deploy }}"
-
-- name: Create directories for docker-compose projects using the systemd service
-  ansible.builtin.file:
-    path: "{{ docker_compose_root }}/{{ item.name }}"
-    state: directory
-    mode: 0400
-  loop: "{{ docker_compose_deploy }}"
-  when: docker_compose_deploy is defined
-
-- 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
-
-- name: Set environment variables for docker-compose projects
-  ansible.builtin.template:
-    src: docker-compose-env.j2
-    dest: "{{ docker_compose_root }}/{{ item.name }}/.env"
-    mode: 0400
-  loop: "{{ docker_compose_deploy }}"
-  when: docker_compose_deploy is defined and item.env is defined
-
 - name: Add users to docker group
   ansible.builtin.user:
     name: "{{ item }}"
@@ -82,11 +30,3 @@
     name: docker
     state: started
     enabled: true
-
-- name: Start docker-compose services and enable on boot
-  ansible.builtin.service:
-    name: "{{ docker_compose_service }}@{{ item.name }}"
-    state: started
-    enabled: true
-  loop: "{{ docker_compose_deploy }}"
-  when: item.enabled is defined and item.enabled is true

roles/docker/templates/docker-compose-env.j2

@@ -1,7 +0,0 @@
-# {{ ansible_managed }}
-
-{% if item.env is defined %}
-{% for kvpair in item.env.items() %}
-{{ kvpair.0 }}={{ kvpair.1 }}
-{% endfor %}
-{% endif %}