2 Commits

Author SHA1 Message Date
f4f5b10395 Change nginx role to staticweb 2023-08-24 23:18:42 -04:00
9b5be29a1a Update Vagrantfile to use external settings 2023-08-21 18:46:47 -04:00
6 changed files with 29 additions and 28 deletions

2
.gitignore vendored
View File

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

47
Vagrantfile vendored
View File

@@ -1,43 +1,45 @@
# -*- mode: ruby -*- # -*- mode: ruby -*-
# vi: set ft=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 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"] PLAYBOOK=ENV["PLAYBOOK"]
if !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? if !PLAYBOOK || PLAYBOOK.empty?
PLAYBOOK = "\nERROR: Set env PLAYBOOK" puts "[VAGRANTFILE ERROR]: Set PLAYBOOK setting in .vagrant.yml"
abort
end end
else
File.write(".playbook", PLAYBOOK)
end end
Vagrant.configure("2") do |config| Vagrant.configure("2") do |config|
config.vm.box = "debian/bullseye64" config.vm.box = VAGRANT_BOX
config.vm.network "private_network", type: "dhcp" 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 config.ssh.forward_agent = SSH_FORWARD
# Machine Name # Libvrit provider
config.vm.define :moxie do |moxie| #
end
config.vm.provider :libvirt do |libvirt| config.vm.provider :libvirt do |libvirt|
libvirt.cpus = 2 libvirt.cpus = VAGRANT_CPUS
libvirt.memory = 4096 libvirt.memory = VAGRANT_MEM
libvirt.default_prefix = ""
end 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 end
# Provision with Ansible # Provision with Ansible
@@ -46,5 +48,4 @@ Vagrant.configure("2") do |config|
ansible.compatibility_mode = "2.0" ansible.compatibility_mode = "2.0"
ansible.playbook = "dev/" + PLAYBOOK + ".yml" ansible.playbook = "dev/" + PLAYBOOK + ".yml"
end end
end end

View File

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

View File

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