Merge branch 'release/0.7.0' into production

Vagrantfile

@@ -2,23 +2,30 @@
 # vi: set ft=ruby :
 
 Vagrant.configure(2) do |config|
-  config.vm.box = "debian/stretch64"
+  config.vm.box = "debian/buster64"
 
   config.vm.hostname = "gvaldap.local"
-  config.vm.network "private_network", ip: "172.16.3.3", lxc__bridge_name: 'vlxcbr1'
+  config.vm.network :private_network, :ip => "172.16.3.3"
 
   config.vm.network "forwarded_port", guest: 8000, host: 8001
 
   config.vm.synced_folder "../gvasalt/states/", "/srv/salt/"
   config.vm.synced_folder "../gvasalt/pillar/", "/srv/pillar/"
 
+  config.vm.provider :libvirt do |libvirt|
+      libvirt.memory = 1024
+  end
+
+  config.vm.provision :shell, path: "change-vmdebootstrap-default-dhcp.sh"
+
   config.vm.provision :salt do |salt|
-      salt.bootstrap_script = "salt/bootstrap.sh"
+      salt.bootstrap_options = "-x python3"
       salt.minion_id = "gvaldap"
       salt.masterless = true
       salt.run_highstate = true
       salt.verbose = true
       salt.colorize = true
       salt.log_level = "warning"
+      salt.grains_config = "salt/grains"
   end
 end

change-vmdebootstrap-default-dhcp.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+debootstrap_network=/etc/systemd/network/99-dhcp.network
+
+if grep -q '^Name=\\*' "${debootstrap_network}"; then
+  primary_nic=$(ls -1 /sys/class/net | grep -v lo |sort | head -1)
+  sed -i "s/^Name=e\\*/Name=${primary_nic}/" \
+    "${debootstrap_network}"
+  systemctl restart systemd-networkd.service
+  echo "Changed systemd network configuration"
+else
+  echo "Systemd network configuration has already been changed"
+fi

docs/changelog.rst

@@ -1,6 +1,9 @@
 Changelog
 =========
 
+* :release:`0.7.0 <2020-04-06>`
+* :support:`-` update Vagrant setup to Debian Buster and Python 3
+
 * :release:`0.6.0 <2020-03-03>`
 * :support:`-` add Python 3 support
 * :support:`-` upgrade to Django 2.2.10

docs/conf.py

@@ -37,8 +37,8 @@ django.setup()
 extensions = ['releases', 'sphinx.ext.autodoc', 'celery.contrib.sphinx']
 
 # configuration for releases extension
-releases_issue_uri = 'https://dev.gnuviech-server.de/gvaldap/ticket/%s'
-releases_release_uri = 'https://dev.gnuviech-server.de/gvaldap/browser/?rev=%s'
+releases_issue_uri = 'https://git.dittberner.info/gnuviech/gvaldap/issues/%s'
+releases_release_uri = 'https://git.dittberner.info/gnuviech/gvaldap/src/tag/%s'
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -54,7 +54,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'gvaldap'
-copyright = u'2014-2020 Jan Dittberner'
+copyright = u'2014-2020, Jan Dittberner'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

gvaldap/gvaldap/__init__.py

@@ -1,7 +1,7 @@
 """
 This is the gvaldap project module.
 """
-__version__ = "0.6.0"
+__version__ = "0.7.0"
 
 from ldaptasks.celery import app as celery_app
 

salt/bootstrap.sh

@@ -1,36 +0,0 @@
-#!/bin/sh -
-
-apt-get update
-apt-get install -y python-cryptography
-
-# We just download the bootstrap script by default and execute that.
-if [ -x /usr/bin/fetch ]; then
-    /usr/bin/fetch -o - https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sh -s -- "$@"
-elif [ -x /usr/bin/curl ]; then
-    /usr/bin/curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sh -s -- "$@"
-else
-    python \
-        -c 'import urllib; print urllib.urlopen("https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh").read()' \
-        | sh -s -- "$@"
-fi
-
-cat >/etc/salt/minion <<EOF
-file_client: local
-
-file_roots:
-  base:
-    - /srv/salt/
-
-pillar_roots:
-  base:
-    - /srv/pillar
-
-log_file: file:///dev/log
-EOF
-
-umask 077
-cat >/etc/salt/grains <<EOF
-roles:
-  - ldapserver
-  - gnuviechadmin.gvaldap
-EOF

salt/grains

@@ -0,0 +1,10 @@
+gnuviechadmin:
+  user: vagrant
+  group: vagrant
+  checkout: /vagrant
+  home: /home/vagrant
+  update_git: False
+roles:
+  - vagrant
+  - ldapserver
+  - gnuviechadmin.gvaldap

salt/minion

@@ -0,0 +1,11 @@
+file_client: local
+
+file_roots:
+  base:
+    - /srv/salt/
+
+pillar_roots:
+  base:
+    - /srv/pillar
+
+log_file: file:///dev/log