saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index c06e2dc32bcf3b7f636150fad001900139688c63..5f41d9e1ed15444ccabb6a87aea966bfbed9d3f6 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -976,6 +976,10 @@ maybe chmod 0640 'ssmtp/ssmtp.conf'
 maybe chmod 0440 'sudoers'
 maybe chmod 0750 'sudoers.d'
 maybe chmod 0440 'sudoers.d/pbadmin-usb-gw'
+maybe chmod 0755 'supervisor'
+maybe chmod 0755 'supervisor/conf.d'
+maybe chmod 0644 'supervisor/conf.d/liveboot.conf'
+maybe chmod 0644 'supervisord.conf'
 maybe chmod 0644 'sysctl.conf'
 maybe chmod 0755 'sysctl.d'
 maybe chmod 0644 'sysctl.d/README'

diff --git a/portage/package.use b/portage/package.use
index 4d5194d52a31397a56eff3da6c8a6a0155cec61b..93e32af0f0f70dca3428f27ab42c2c1df6a1d756 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -63,4 +63,6 @@ virtual/postgresql              -server
 
 www-client/elinks               gc xml
 
+www-servers/uwsgi               yaml
+
 # vim: ts=8

diff --git a/supervisor/conf.d/liveboot.conf b/supervisor/conf.d/liveboot.conf
new file mode 100644 (file)
index 0000000..91e25d5
--- /dev/null
+++ b/supervisor/conf.d/liveboot.conf
@@ -0,0 +1,9 @@
+[program:liveboot]
+command=/usr/bin/uwsgi --http-socket :8000 --plugin python --wsgi-file /var/www/liveboot/liveboot.wsgi
+autostart=true
+autorestart=true
+stdout_logfile=/var/log/uwsgi/liveboot.log
+redirect_stderr=true
+exitcodes=0
+
+# vim: filetype=dosini

diff --git a/supervisord.conf b/supervisord.conf
new file mode 100644 (file)
index 0000000..0e53687
--- /dev/null
+++ b/supervisord.conf
@@ -0,0 +1,35 @@
+; supervisor config file
+
+[unix_http_server]
+file=/run/supervisor.sock   ; (the path to the socket file)
+chmod=0700                  ; sockef file mode (default 0700)
+
+[supervisord]
+logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
+pidfile=/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
+childlogdir=/var/log/supervisor            ; ('AUTO' child log dir, default $TEMP)
+
+; the below section must remain in the config file for RPC
+; (supervisorctl/web interface) to work, additional interfaces may be
+; added by defining them in separate rpcinterface: sections
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///run/supervisor.sock ; use a unix:// URL  for a unix socket
+
+; The [include] section can just contain the "files" setting.  This
+; setting can list multiple files (separated by whitespace or
+; newlines).  It can also contain wildcards.  The filenames are
+; interpreted as relative to this file.  Included files *cannot*
+; include files themselves.
+
+[include]
+files = /etc/supervisor/conf.d/*.conf
+
+[inet_http_server]
+port=*:9001
+username=pretest
+password=pretest
+
+# vim: filetype=dosini