saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 58e98dd49bdb7a1f3a0be12c3575456840130a6f..3bba79c8b21939957c6bb62072fd1180e71a4042 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -837,6 +837,7 @@ maybe chmod 0755 'profitbricks'
 maybe chmod 0644 'profitbricks/andbd.conf'
 maybe chmod 0644 'profitbricks/andbd.conf.orig'
 maybe chmod 0644 'profitbricks/andbd_admin.log'
+maybe chmod 0644 'profitbricks/salt-webui.py'
 maybe chmod 0644 'protocols'
 maybe chmod 0755 'qemu'
 maybe chmod 0644 'qemu/bridge.conf'
@@ -865,6 +866,8 @@ maybe chmod 0644 'salt/master'
 maybe chmod 0644 'salt/master.orig'
 maybe chmod 0644 'salt/master.qa'
 maybe chmod 0644 'salt/minion'
+maybe chmod 0755 'salt/minion.d'
+maybe chmod 0644 'salt/minion.d/_schedule.conf'
 maybe chmod 0644 'salt/minion_id'
 maybe chmod 0770 'salt/pki'
 maybe chmod 0700 'salt/pki/master'

diff --git a/portage/package.use b/portage/package.use
index 93e32af0f0f70dca3428f27ab42c2c1df6a1d756..45c58a2e50bf7a18f3cc16572d923b5a8403f89f 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -8,6 +8,8 @@ app-emulation/qemu              iscsi static-user
 
 app-misc/mc                     sftp spell
 
+app-portage/eix                 strong-optimization tools
+
 dev-db/mariadb                  -server
 dev-db/postgresql               perl -server uuid xml
 dev-db/sqlite                   tools
@@ -30,11 +32,12 @@ net-dns/unbound                 dnstap
 
 net-ftp/lftp                    convert-mozilla-cookies verify-file
 
-net-misc/iputils                caps gnutls
+net-misc/iputils                arping caps clockdiff gcrypt gnutls rarpd rdisc tftpd tracepath traceroute
 net-misc/openssh                ldns
 
 sys-apps/busybox                pam
 sys-apps/etckeeper              cron
+sys-apps/gawk                   mpfr
 sys-apps/irqbalance             caps numa
 sys-apps/openrc                 tools
 sys-apps/util-linux             tty-helpers

diff --git a/profitbricks/salt-webui.py b/profitbricks/salt-webui.py
new file mode 100644 (file)
index 0000000..eb1cd24
--- /dev/null
+++ b/profitbricks/salt-webui.py
@@ -0,0 +1,18 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+Configuration for QA Salt WebUi.
+"""
+
+import os
+
+PXE_BOOT_SERVER = 'pxe.stg.profitbricks.net'
+PXE_BOOT_SERVER_SALT = 'weimar.pb.local'
+#PXE_LIVEBOOT_ROOT_DIR = os.sep + os.path.join('srv', 'tftp', 'liveboot-dcmanager')
+
+#LOG_DIR = os.sep + os.path.join('var', 'log', 'uwsgi')
+#LB_LOG_FILE = os.path.join(LOG_DIR, 'salt-webui.log')
+
+#CONFIG_DIR = os.sep + os.path.join('etc', 'profitbricks')
+#CONFIG_FILE = os.path.join(CONFIG_DIR, 'salt-webui.py')
+

diff --git a/salt/minion.d/_schedule.conf b/salt/minion.d/_schedule.conf
new file mode 100644 (file)
index 0000000..84f5a73
--- /dev/null
+++ b/salt/minion.d/_schedule.conf
@@ -0,0 +1,2 @@
+schedule:
+  __mine_interval: {function: mine.update, jid_include: true, maxrunning: 2, minutes: 60}

diff --git a/supervisor/conf.d/liveboot.conf b/supervisor/conf.d/liveboot.conf
index 91e25d50a8449c65fd8c9cab8be113ce1f31ef0d..d3416817850d900ea38a8501b48324cfed636414 100644 (file)
--- a/supervisor/conf.d/liveboot.conf
+++ b/supervisor/conf.d/liveboot.conf
@@ -1,5 +1,5 @@
 [program:liveboot]
-command=/usr/bin/uwsgi --http-socket :8000 --plugin python --wsgi-file /var/www/liveboot/liveboot.wsgi
+command=/usr/bin/uwsgi --http-socket :8000 --uid fbrehm --enable-threads --plugin python --wsgi-file /var/www/liveboot/liveboot.wsgi
 autostart=true
 autorestart=true
 stdout_logfile=/var/log/uwsgi/liveboot.log