falkorlib 0.8.10 → 0.9.0

data/spec/falkorlib/git_spec.rb

@@ -2,7 +2,7 @@
 #########################################
 # git_spec.rb
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# Time-stamp: <Sun 2022-06-05 17:15 svarrette>
+# Time-stamp: <Wed 2023-11-22 17:21 svarrette>
 #
 # @description Check the Git operations
 #
@@ -316,7 +316,7 @@ describe FalkorLib::Git do
 
         [ :subtrees, :submodules ].each do |type|
           it "#config_warn(#{type})" do
-            t = capture(:stdout) { FalkorLib::Git.config_warn(type) }
+            t = capture(:stderr) { FalkorLib::Git.config_warn(type) }
             expect(t).to include "FalkorLib.config.git"
             expect(t).to include "FalkorLib.config.git.submodulesdir" if type == :submodules
           end

data/spec/falkorlib/gitflow_spec.rb

@@ -2,7 +2,7 @@
 #########################################
 # gitflow_spec.rb
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# Time-stamp: <Sun 2020-04-12 15:15 svarrette>
+# Time-stamp: <Wed 2023-11-22 09:52 svarrette>
 #
 # @description Check the Git Flow operations -- see https://github.com/nvie/gitflow
 #
@@ -50,7 +50,7 @@ describe FalkorLib::GitFlow do
       it "#branch" do
         expected = {
           :master  => 'production',
-          :develop => 'devel'
+          :develop => 'master'
         }
         expected.each do |type,v|
           b = FalkorLib::GitFlow.branches(type.to_sym, dir)
@@ -82,9 +82,10 @@ describe FalkorLib::GitFlow do
         c = FalkorLib::GitFlow.guess_gitflow_config(dir)
         {
           :master  => 'production',
-          :develop => 'devel'
+          :develop => 'master'
         }.each do |type,v|
-          expect(c[:branches][type.to_sym]).to eq(v)
+          expect(c[:branches][type.to_sym]).to eq(v)      if v.is_a? String
+          expect(v).to include(c[:branches][type.to_sym]) if v.is_a? Array
         end
         {
           :feature    => 'feature/',

data/templates/latex/beamer/.Makefile.local

@@ -0,0 +1 @@
+BIBTEX = biber

data/templates/latex/beamer/_content.md.erb

@@ -155,7 +155,7 @@ The classical markdown syntax `![](<path/to/image>)` does not allow any control
 
 So you probaby wish to do it in \LaTeX\ directly
 
-\centerline{\includegraphics[width=4em]{logo_ULHPC.pdf}}
+\centerline{\includegraphics[width=4em]{logo_ANSSI.png}}
 
 A normal (left aligned) text afterward
 

data/templates/latex/beamer/main.tex.erb

@@ -1,4 +1,4 @@
-% Time-stamp: <Thu 2017-08-17 22:22 svarrette>
+% Time-stamp: <Thu 2023-11-23 17:53 svarrette>
 % =============================================================================
 % File:  <%= config[:name] %>.tex --
 % Author(s): <%= config[:author] %> (<%= config[:mail] %>)
@@ -15,6 +15,16 @@
 \documentclass[aspectratio=169]{beamer}
 % \documentclass[draft]{beamer}
 \usepackage{_style}
+\usepackage[
+  backend=biber,
+  maxnames=999,
+  giveninits=true,
+  style=verbose,
+]{biblatex}
+% \addbibresource{biblio.bib}
+\setbeamerfont{footnote}{size=\tiny}
+% Usage in slides: \footfullcite{<bibentry>}
+
 
 % The key part to use my theme -- if you precise nothing, the image that
 % illustrate the slides is assumed to be images/slides_image.jpg
@@ -41,8 +51,11 @@
 \author[<%= config[:author] %> \& al.]{
   \underline{<%= config[:author] %>}
 }
-\institute[University of Luxembourg]{
-  \myurl{https://hpc.uni.lu}
+\institute[ANSSI/SDE/DST/LAM]{
+  ANSSI/SDE/DST/LAM
+  Agence nationale de la sécurité des systèmes d'information / French National Cybersecurity Agency
+  Laboratoire Architectures Matérielles et logicielles (LAM)
+  \myurl{<%= config[:url] %>}
 }
 
 % Mandatory to **declare** a logo to be placed on the bottom right -- normally the
@@ -80,11 +93,10 @@
     \column{0.5\textwidth}
     % \emph{Contact}\\
     {\tiny
-      \emph{<%= config[:author] %>}\\
-      ~~~~ \structure{University of Luxembourg, Belval Campus}:\\
-      ~~~~ Maison du Nombre, 4th floor\\
-      ~~~~ 2, avenue de l'Universit\'e\\
-      ~~~~ L-4365 Esch-sur-Alzette\\
+      \emph{ANSSI/SDE/DST/LAM}\\
+      ~~~~ \structure{Laboratoire Architectures Matérielles et logicielles}\\
+      \emph{Contacts:}\\
+      ~~~~\emph{<%= config[:author] %>}\\
       ~~~~ \textit{mail:} \href{mailto:<%= config[:mail] %>}{<%= config[:mail] %>}\\
     }
     \column{0.5\textwidth}

data/templates/vagrant/.gitignore

@@ -0,0 +1,14 @@
+# Created by https://www.toptal.com/developers/gitignore/api/vagrant
+# Edit at https://www.toptal.com/developers/gitignore?templates=vagrant
+
+### Vagrant ###
+# General
+.vagrant/
+
+# Log files (if you are creating logs in debug mode, uncomment this)
+# *.log
+
+### Vagrant Patch ###
+*.box
+
+# End of https://www.toptal.com/developers/gitignore/api/vagrant

data/templates/vagrant/Vagrantfile.erb

@@ -1,6 +1,6 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
-# Time-stamp: <Mon 2020-04-20 15:32 svarrette>
+# Time-stamp: <Mon 2023-12-04 17:12 svarrette>
 ###########################################################################################
 #             __     __                          _    __ _ _
 #             \ \   / /_ _  __ _ _ __ __ _ _ __ | |_ / _(_) | ___
@@ -25,7 +25,7 @@ require 'erb'
 [ 'vagrant-hosts',
   'vagrant-vbguest',
   'vagrant-cachier',
-  # 'vagrant-libvirt',
+  'vagrant-libvirt',
   'deep_merge',
   'terminal-table' ].each do |plugin|
   abort "Install the  '#{plugin}' plugin with 'vagrant plugin install #{plugin}'" unless Vagrant.has_plugin?("#{plugin}")
@@ -53,9 +53,10 @@ DEFAULT_SETTINGS = {
   # Default images settings
   :defaults => {
     :os     => :<%= config[:os] %>,
+    :provider =>  :<%= config[:provider] %>,
     :ram    => <%= config[:ram] %>,
     :vcpus  => <%= config[:vcpus] %>,
-    :vbguest_auto_update => true,
+    :vbguest_auto_update => false,
     :role   => 'default',
     # :nodes  => 1,
   },
@@ -66,10 +67,18 @@ DEFAULT_SETTINGS = {
   },
   # Default Boxes
   :boxes => {
-    :centos8  => '<%= config[:boxes][:centos8] %>',
-    :centos7  => '<%= config[:boxes][:centos7] %>',
-    :debian8  => '<%= config[:boxes][:debian8] %>',
-    :ubuntu14 => '<%= config[:boxes][:ubuntu14] %>'
+    :debian12        => '<%= config[:boxes][:debian12] %>',
+    :debian12_uefi   => '<%= config[:boxes][:debian12_uefi] %>',
+    :almalinux9      => '<%= config[:boxes][:almalinux9] %>',
+    :almalinux8      => '<%= config[:boxes][:almalinux8] %>',
+    :almalinux8_uefi => '<%= config[:boxes][:almalinux8_uefi] %>',
+    :rockylinux8     => '<%= config[:boxes][:rockylinux8] %>',
+    :centosstream9   => '<%= config[:boxes][:centosstream9] %>',
+    :centosstream8   => '<%= config[:boxes][:centosstream8] %>',
+    :ubuntu22        => '<%= config[:boxes][:ubuntu22] %>',
+    :ubuntu20        => '<%= config[:boxes][:ubuntu20] %>',
+    :fedora38        => '<%= config[:boxes][:fedora38] %>',
+    :archlinux       => '<%= config[:boxes][:archlinux] %>'
   },
   # virtual images to deploy
   # <name>:
@@ -126,18 +135,21 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     # set auto_update to false, if you do NOT want to check the correct
     # additions version when booting these boxes
     config.vbguest.auto_update = defaults[:vbguest_auto_update]
+    config.vbguest.installer_options = { allow_kernel_upgrade: true }
+
   end
 
   # Shell provisioner, to bootstrap each box with the minimal settings/packages
   DEFAULT_PROVISIONING_SCRIPTS.each do |script|
     config.vm.provision "shell", path: "#{script}", keep_color: true
   end
-  config.vm.synced_folder ".", "/vagrant", type: "virtualbox"
+
+  # config.vm.synced_folder ".", "/vagrant", type: "virtualbox"  # done by default
   ## Uncomment the below part if you want and additional shared directory
   # config.vm.synced_folder "vagrant/shared", "/shared", mount_options: ['dmode=777','fmode=777'],
   #                         type: "virtualbox" # Shared directory for users
   if Dir.exist?(File.join(TOP_PUPPETDIR, 'hieradata'))
-    config.vm.synced_folder "#{puppet_dir}/hieradata", "/tmp/vagrant-puppet/hieradata", type: "virtualbox"
+    config.vm.synced_folder "#{puppet_dir}/hieradata", "/tmp/vagrant-puppet/hieradata" #, type: "virtualbox"
   end
 
   # network settings
@@ -161,12 +173,14 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     boxname  = defaults[:os].to_s.downcase.gsub(/([^\d]+)(\d+)/, '\\1-\\2')
     name     = boxname if name == 'default'
     os       = node[:os]       ? node[:os].to_sym : defaults[:os].to_sym
+    provider = (os =~ /_uefi$/)? 'libvirt'        : defaults[:provider]
+    provider = node[:provider] if node[:provider]
     ram      = node[:ram]      ? node[:ram]       : defaults[:ram]
     vcpus    = node[:vcpus]    ? node[:vcpus]     : defaults[:vcpus]
     role     = node[:role]     ? node[:role]      : 'default'
     desc     = node[:desc]     ? node[:desc]      : 'n/a'
     puppet_modules = node[:puppet_modules] ? node[:puppet_modules] : []
-
+    warn "provider: #{provider}"
     abort "Non-existing box OS '#{os}' for the VM '#{name}'" if  settings[:boxes][os.to_sym].nil?
     abort "Empty IP address range" if ip_range.empty?
     ip = ip_range[ ip_index.to_i ].to_s
@@ -175,13 +189,36 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.vm.define "#{name}" do |c|
       c.vm.box      = settings[:boxes][os.to_sym]
       c.vm.hostname = "#{fqdn}"
-      c.vm.network :private_network, :ip => ip
+      c.vm.network   :private_network,
+                     :ip => ip,
+                     :libvirt__network_address => network[:range], # ip_range[0].to_s + '/24',
+                     :libvirt__forward_mode   => 'nat'
+
       c.vm.provision :hosts, :sync_hosts => true
+      # (eventually) Force default provider
+      c.vm.provider  :"#{provider}" if provider != 'virtualbox'
 
-      c.vm.provider "virtualbox" do |v|
+      # Custom VM configs for virtualbox provider
+      c.vm.provider 'virtualbox' do |v|
         v.customize [ 'modifyvm', :id, '--name', hostname, '--memory', ram.to_s ]
         v.customize [ 'modifyvm', :id, '--cpus', vcpus.to_s ] if vcpus.to_i > 1
         #v.customize [ 'setextradata', :id, 'VBoxInternal2/SharedFoldersEnableSymlinksCreate/v-root', '1']
+        v.customize ["modifyvm", :id, "--firmware", "efi"]
+      end
+      # Custom VM configs for libvirt provider
+      # see https://vagrant-libvirt.github.io/vagrant-libvirt/configuration.html
+      c.vm.provider :libvirt do |lv|
+        lv.uri = 'qemu:///system'
+        lv.host   = hostname
+        lv.cpus   = vcpus
+        lv.memory = ram
+        # lv.nested = true
+
+        # Emulated TPM
+        lv.tpm_model = "tpm-crb"
+        lv.tpm_type = "emulator"
+        lv.tpm_version = "2.0"
+
       end
 
       # role specialization
@@ -201,8 +238,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       end
 
       # A role fact MUST be defined (default: 'default') as it is used in Hiera config
+      facts_dir = '/etc/facter/facts.d/'
       c.vm.provision "shell",
-                     inline: "echo '{ \"role\": \"#{role}\" }' > /opt/puppetlabs/facter/facts.d/custom.json",
+                     inline: "mkdir -p #{facts_dir}; echo '{ \"role\": \"#{role}\" }' > #{facts_dir}/custom.json",
                      keep_color: true
       ################ Puppet install ##############
       c.vm.provision "puppet" do |puppet|
@@ -222,14 +260,14 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
       __table[:rows] << [ name, fqdn, os.to_sym, "#{vcpus}/#{ram}", role, desc, ip]
 
-      if settings[:vms].keys.last == name
+      #if settings[:vms].keys.last == name
         c.trigger.after :up do |trigger|
           trigger.info = (Terminal::Table.new __table).to_s
           trigger.warn = <<-EOF
 - Virtual Vagrant infrastructure successfully deployed!
 EOF
         end
-      end
+      #end
 
     end # config.vm.define
   end  # settings

data/templates/vagrant/vagrant/config.yaml.sample

@@ -1,5 +1,5 @@
 # -*- mode: yaml; -*-
-# Time-stamp: <Sat 2020-04-18 18:00 svarrette>
+# Time-stamp: <Sat 2023-11-18 16:59 svarrette>
 ################################################################################
 # Complementary configuration for Vagrant
 # You can overwrite here the default settings defined in ../Vagrantfile and
@@ -11,15 +11,18 @@
 # Format:
 #   :<os><version>: <username>/<box> # see https://vagrantcloud.com
 # :boxes:
-#   :centos8: 'centos/8'
-#   :centos7: 'centos/7'
-#   :debian8: 'debian/contrib-jessie64'
-#   :ubuntu14: 'ubuntu/trusty64'
+#   :debian12:    'debian/bookworm64'
+#   :rockylinux9: 'rockylinux/9'
+#   :rockylinux8: 'rockylinux/8'
+#   :ubuntu22:    'ubuntu/jammy64'
+#   :ubuntu20:    'ubuntu/focal64'
+#   :fedora38:    'generic/fedora38'
+#   :archlinux:    'archlinux/archlinux'
 
 #_________________
 # Default settings
 # :defaults:
-#   :os: :centos7         # Default OS from the above box definition
+#   :os: :debian12        # Default OS from the above box definition
 #   :ram: 512             # Default RAM
 #   :vcpus: 1             # Default number of virtual CPUs
 #   :vbguest_auto_update: 1  # check/update box guest additions

data/templates/vagrant/vagrant/scripts/bootstrap.sh

@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
-# Time-stamp: <Sun 2020-04-19 12:39 svarrette>
+# Time-stamp: <Mon 2023-12-04 17:51 svarrette>
 ###########################################################################################
 # __     __                          _     ____              _       _
 # \ \   / /_ _  __ _ _ __ __ _ _ __ | |_  | __ )  ___   ___ | |_ ___| |_ _ __ __ _ _ __
-#  \ \ / / _` |/ _` | '__/ _` | '_ \| __| |  _ \ / _ \ / _ \| __/ __| __| '__/ _` | '_ \
-    #   \ V / (_| | (_| | | | (_| | | | | |_  | |_) | (_) | (_) | |_\__ \ |_| | | (_| | |_) |
+#  \ \ / / _` |/ _` | '__/ _` | '_ \| __| |  _ \ / _ \ / _ \| __/ __| __| '__/ _` | '_ \  .
+#   \ V / (_| | (_| | | | (_| | | | | |_  | |_) | (_) | (_) | |_\__ \ |_| | | (_| | |_) |
 #    \_/ \__,_|\__, |_|  \__,_|_| |_|\__| |____/ \___/ \___/ \__|___/\__|_|  \__,_| .__/
 #              |___/                                                              |_|
-#            Copyright (c) 2017-2020 Sebastien Varrette <sebastien.varrette@uni.lu>
+#            Copyright (c) 2017-2023 Sebastien Varrette
 ###########################################################################################
 # (prefered) way to see a Vagrant box configured.
 #
@@ -26,12 +26,12 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 MOTD="/etc/motd"
 DOTFILES_DIR='/etc/dotfiles.d'
 DOTFILES_URL='https://github.com/ULHPC/dotfiles.git'
-EXTRA_PACKAGES=
+EXTRA_PACKAGES='swtpm swtpm-tools'
 
 TITLE=$(hostname -s)
 
 # List of default packages to install
-COMMON_DEFAULT_PACKAGES="ruby wget figlet git screen bash-completion rsync vim htop net-tools mailx"
+COMMON_DEFAULT_PACKAGES="ruby wget figlet git screen bash-completion rsync vim htop net-tools"
 
 ######
 # Print information in the following form: '[$2] $1' ($2=INFO if not submitted)
@@ -67,6 +67,15 @@ setup_redhat() {
     touch    /etc/sysconfig/bash-prompt-screen
     chmod +x /etc/sysconfig/bash-prompt-screen
 
+    if [ -x "/usr/bin/crb" ]; then
+        info "Enable CodeReady Builder (CRB) repository"
+        /usr/bin/crb enable
+    fi
+
+    if ! grep -e "fastestmirror" /etc/dnf/dnf.conf; then
+        echo "fastestmirror=1" >> /etc/dnf/dnf.conf
+    fi
+
     info "Running yum update"
     yum update -y  >/dev/null
 
@@ -81,17 +90,24 @@ setup_redhat() {
     os_version=$(rpm -q --qf "%{VERSION}" $(rpm -q --whatprovides redhat-release))
     info "Adding Puppet Labs repo and installing Puppet for RHEL/CentOS ${os_version}"
     # Get the major version
-    yum install -y https://yum.puppetlabs.com/puppet-release-el-$(echo $os_version | cut -d '.' -f 1).noarch.rpm
+    yum install -y https://yum.puppetlabs.com/puppet7-release-el-$(echo $os_version | cut -d '.' -f 1).noarch.rpm
     yum install -y puppet
 }
 
 setup_apt() {
+    export DEBIAN_FRONTEND=noninteractive
+
     case $1 in
         3*) codename=cumulus ;;
         6)  codename=squeeze ;;
         7)  codename=wheezy ;;
         8)  codename=jessie  ;;
         9)  codename=stretch  ;;
+        10) codename=buster  ;;
+        11) codename=bullseye ;;
+        12) codename=bookworm ;;
+        13) codename=trixie ;;
+        14) codename=forky ;;
         12.04) codename=precise ;;
         14.04) codename=trusty  ;;
         16.04) codename=xenial ;;
@@ -104,13 +120,12 @@ setup_apt() {
     info "Installing default packages"
     apt-get install -y ${COMMON_DEFAULT_PACKAGES} git-core ${EXTRA_PACKAGES}  >/dev/null
 
-    info "Installing Puppet and its dependencies"
-    apt-get install puppet-agent -y >/dev/null
-    apt-get install apt-transport-https -y >/dev/null
+    info "Set locale"
+    localectl set-locale LANG=en_US.UTF-8
+
+    info "Installing puppet"
+    apt-get install -y puppet >/dev/null
 
-    info "installing Environment modules and  LMod"
-    apt-get install -y environment-modules lmod
-    apt-get install -y build-essentials
 }
 
 setup_linux() {
@@ -144,7 +159,7 @@ setup_linux() {
     info "Detected Linux distro: ${distro} version ${majver} on arch ${ARCH}"
     case "$distro" in
         debian|ubuntu) setup_apt $majver ;;
-        redhat|fedora|centos|scientific|amazon) setup_redhat $majver ;;
+        redhat|rocky|fedora|centos|almalinux|scientific|amazon) setup_redhat $majver ;;
         *) echo "Not supported distro: $distro"; exit 1;;
     esac
 
@@ -169,6 +184,9 @@ setup_dotfiles () {
         info "installing dotfiles for 'vagrant' user"
         sudo -u vagrant ${dotfile_install_cmd}
     fi
+    info "cleanup .inputrc"
+    rm -f /root/.inputrc
+    sudo -u vagrant rm -f ~vagrant/.inputrc
 }
 
 setup_motd() {