Added all prod service files and mq workers.

mq/mqwAutoland.ini

@@ -3,7 +3,7 @@ chdir = /opt/mozdef/envs/mozdef/mq/
 uid = mozdef
 mule = esworker.py
 pyargv = -c /opt/mozdef/envs/mozdef/mq/esworker.autoland.conf
-logto = /opt/mozdef/envs/mozdef/logs/uwsgi.mqw.autoland.log
+logto = /opt/mozdef/envs/mozdef/logs/uwsgi.autoland.log
 ;ignore normal operations that generate nothing but normal response
 ;
 log-drain = generated 0 bytes
@@ -14,6 +14,6 @@ procname-master = [m]
 procname-prefix = [mqwAutoland]
 master-fifo = /opt/mozdef/envs/mozdef/mq/mqwAutoland.fifo
 never-swap
-pidfile= /var/run/mozdefmq/mqwAutoland.pid
+pidfile = /var/run/mozdefmq/mqwAutoland.pid
 vacuum = true
 enable-threads

mq/mqwBroStage.ini

@@ -13,6 +13,6 @@ procname-master = [m]
 procname-prefix = [mqwBroStage]
 master-fifo = /opt/mozdef/envs/mozdef/mq/mqwBroStage.fifo
 never-swap
-pidfile= /var/run/mqwBroStage/mqwBroStage.pid
+pidfile = /var/run/mqwBroStage/mqwBroStage.pid
 vacuum = true
 enable-threads

mq/mqwDeisPapertrail.ini

@@ -0,0 +1,18 @@
+[uwsgi]
+chdir = /opt/mozdef/envs/mozdef/mq/
+uid = mozdef
+mule = esworker.papertrail.py
+pyargv = -c /opt/mozdef/envs/mozdef/mq/esworker.deispapertrail.conf
+logto = /opt/mozdef/envs/mozdef/logs/uwsgi.deispapertrail.log
+;ignore normal operations that generate nothing but normal response
+log-drain = generated 0 bytes
+log-date = %%a %%b %%d %%H:%%M:%%S
+socket = /opt/mozdef/envs/mozdef/mq/mqwDeisPapertrail.socket
+virtualenv = /opt/mozdef/envs/mozdef/
+procname-master = [m]
+procname-prefix = [mqwDeisPapertrail]
+master-fifo = /opt/mozdef/envs/mozdef/mq/mqwDeisPapertrail.fifo
+never-swap
+pidfile = /var/run/mozdefmqwDeisPapertrail/mqwDeisPapertrail.pid
+vacuum = true
+enable-threads

mq/mqwFxaProd.ini

@@ -0,0 +1,27 @@
+[uwsgi]
+chdir = /opt/mozdef/envs/mozdef/mq/
+uid = mozdef
+mule = esworker.py
+mule = esworker.py
+mule = esworker.py
+mule = esworker.py
+mule = esworker.py
+mule = esworker.py
+mule = esworker.py
+mule = esworker.py
+mule = esworker.py
+mule = esworker.py
+pyargv = -c /opt/mozdef/envs/mozdef/mq/esworker.fxaprod.conf
+logto = /opt/mozdef/envs/mozdef/logs/uwsgi.fxaprod.log
+;ignore normal operations that generate nothing but normal response
+log-drain = generated 0 bytes
+log-date = %%a %%b %%d %%H:%%M:%%S
+socket = /opt/mozdef/envs/mozdef/mq/mqwFxaProd.socket
+virtualenv = /opt/mozdef/envs/mozdef/
+procname-master = [m]
+procname-prefix = [mqwFxaProd]
+master-fifo = /opt/mozdef/envs/mozdef/mq/mqwFxaProd.fifo
+never-swap
+pidfile = /var/run/mozdefmqwFxaProd/mqwFxaProd.pid
+vacuum = true
+enable-threads

mq/mqwFxaStage.ini.disabled

@@ -3,7 +3,7 @@ chdir = /opt/mozdef/envs/mozdef/mq/
 uid = mozdef
 mule = esworker.py
 pyargv = -c /opt/mozdef/envs/mozdef/mq/esworker.fxastage.conf
-logto = /opt/mozdef/envs/mozdef/logs/uwsgi.mqw.fxastage.log
+logto = /opt/mozdef/envs/mozdef/logs/uwsgi.fxastage.log
 ;ignore normal operations that generate nothing but normal response
 ;
 log-drain = generated 0 bytes
@@ -14,6 +14,6 @@ master-fifo = /opt/mozdef/envs/mozdef/mq/mqwFxaStage.fifo
 procname-master = [m]
 procname-prefix = [mqwFxaStage]
 never-swap
-pidfile= /var/run/mozdefmq/mqwFxaStage.pid
+pidfile = /var/run/mozdefmq/mqwFxaStage.pid
 vacuum = true
 enable-threads

mq/mqwInfosecSQSNonProd.ini.disabled

@@ -3,7 +3,7 @@ chdir = /opt/mozdef/envs/mozdef/mq/
 uid = mozdef
 mule = esworker.sqs.py
 pyargv = -c /opt/mozdef/envs/mozdef/mq/esworker.infosecsqs.nonprod.conf
-logto = /opt/mozdef/envs/mozdef/logs/uwsgi.mqESmules.infosecsqs.log
+logto = /opt/mozdef/envs/mozdef/logs/uwsgi.infosecsqs.log
 ;ignore normal operations that generate nothing but normal response
 ;
 log-drain = generated 0 bytes
@@ -14,6 +14,6 @@ master-fifo = /opt/mozdef/envs/mozdef/mq/mqwInfosecSQSNonProd.fifo
 procname-master = [m]
 procname-prefix = [mqwInfosecSQSNonProd]
 never-swap
-pidfile= /var/run/mozdefmqwInfosecSQSNonProd/mqwInfosecSQSNonProd.pid
+pidfile = /var/run/mozdefmqwInfosecSQSNonProd/mqwInfosecSQSNonProd.pid
 vacuum = true
 enable-threads

mq/mqwInfosecSQSProd.ini

@@ -0,0 +1,20 @@
+[uwsgi]
+chdir = /opt/mozdef/envs/mozdef/mq/
+uid = mozdef
+mule = esworker.sqs.py
+mule = esworker.sqs.py
+mule = esworker.sqs.py
+pyargv = -c /opt/mozdef/envs/mozdef/mq/esworker.infosecsqs.prod.conf
+logto = /opt/mozdef/envs/mozdef/logs/uwsgi.infosecsqs.log
+;ignore normal operations that generate nothing but normal response
+log-drain = generated 0 bytes
+log-date = %%a %%b %%d %%H:%%M:%%S
+socket = /opt/mozdef/envs/mozdef/mq/mqwInfosecSQSProd.socket
+virtualenv = /opt/mozdef/envs/mozdef/
+procname-master = [m]
+procname-prefix = [mqwInfosecSQSProd]
+master-fifo = /opt/mozdef/envs/mozdef/mq/mqwInfosecSQSProd.fifo
+never-swap
+pidfile = /var/run//mozdefmqwInfosecSQSProd/mqwInfosecSQSProd.pid
+vacuum = true
+enable-threads

mq/mqwNubisNonProd.ini.disabled

@@ -3,7 +3,7 @@ chdir = /opt/mozdef/envs/mozdef/mq/
 uid = mozdef
 mule = esworker.sqs.py
 pyargv = -c /opt/mozdef/envs/mozdef/mq/esworker.nubis.nonprod.conf
-logto = /opt/mozdef/envs/mozdef/logs/uwsgi.mqw.nubis.log
+logto = /opt/mozdef/envs/mozdef/logs/uwsgi.nubis.log
 ;ignore normal operations that generate nothing but normal response
 log-drain = generated 0 bytes
 log-date = %%a %%b %%d %%H:%%M:%%S
@@ -13,6 +13,6 @@ master-fifo = /opt/mozdef/envs/mozdef/mq/mqwNubisNonProd.fifo
 procname-master = [m]
 procname-prefix = [mqwNubisNonProd]
 never-swap
-pidfile= /var/run/mozdefmqwNubisNonProd/mqwNubisNonProd.pid
+pidfile = /var/run/mozdefmqwNubisNonProd/mqwNubisNonProd.pid
 vacuum = true
 enable-threads

mq/mqwNubisProd.ini

@@ -5,14 +5,16 @@ mule = esworker.sqs.py
 mule = esworker.sqs.py
 mule = esworker.sqs.py
 pyargv = -c /opt/mozdef/envs/mozdef/mq/esworker.nubis.prod.conf
-daemonize = /opt/mozdef/envs/mozdef/logs/uwsgi.mqESmules.nubis.log
+logto = /opt/mozdef/envs/mozdef/logs/uwsgi.nubis.log
 ;ignore normal operations that generate nothing but normal response
 log-drain = generated 0 bytes
 log-date = %%a %%b %%d %%H:%%M:%%S
-socket = /opt/mozdef/envs/mozdef/mq/mqESmulesNubisProd.socket
+socket = /opt/mozdef/envs/mozdef/mq/mqwNubisProd.socket
 virtualenv = /opt/mozdef/envs/mozdef/
-master-fifo = /opt/mozdef/envs/mozdef/mq/mqESmulesNubisProd.fifo
+procname-master = [m]
+procname-prefix = [mqwNubisProd]
+master-fifo = /opt/mozdef/envs/mozdef/mq/mqwNubisProd.fifo
 never-swap
-pidfile= /opt/mozdef/envs/mozdef/mq/mqESmulesNubisProd.pid
+pidfile = /var/run/mozdefmqwNubisProd/mqwNubisProd.pid
 vacuum = true
 enable-threads

mq/mqwRelengPapertrail.ini.disabled

@@ -3,8 +3,9 @@ chdir = /opt/mozdef/envs/mozdef/mq/
 uid = mozdef
 mule = esworker.papertrail.py
 mule = esworker.papertrail.py
+mule = esworker.papertrail.py
 pyargv = -c /opt/mozdef/envs/mozdef/mq/esworker.relengpapertrail.conf
-logto = /opt/mozdef/envs/mozdef/logs/uwsgi.mqESmules.relengpapertrail.log
+logto = /opt/mozdef/envs/mozdef/logs/uwsgi.relengpapertrail.log
 ;ignore normal operations that generate nothing but normal response
 log-drain = generated 0 bytes
 log-date = %%a %%b %%d %%H:%%M:%%S
@@ -14,6 +15,6 @@ procname-master = [m]
 procname-prefix = [mqwRelengPapertrail]
 master-fifo = /opt/mozdef/envs/mozdef/mq/mqwRelengPapertrail.fifo
 never-swap
-pidfile= /var/run/mozdefmqwRelengPapertrail/mqwRelengPapertrail.pid
+pidfile = /var/run/mozdefmqwRelengPapertrail/mqwRelengPapertrail.pid
 vacuum = true
 enable-threads

mq/mqwSyslog.ini

@@ -3,7 +3,7 @@ chdir = /opt/mozdef/envs/mozdef/mq/
 uid = mozdef
 mule = esworker.py
 pyargv = -c /opt/mozdef/envs/mozdef/mq/esworker.syslog.conf
-logto = /opt/mozdef/envs/mozdef/logs/uwsgi.mqwsyslog.log
+logto = /opt/mozdef/envs/mozdef/logs/uwsgi.syslog.log
 ;ignore normal operations that generate nothing but normal response
 log-drain = generated 0 bytes
 log-date = %%a %%b %%d %%H:%%M:%%S
@@ -13,6 +13,6 @@ procname-master = [m]
 procname-prefix = [mqwSyslog]
 master-fifo = /opt/mozdef/envs/mozdef/mq/mqwSyslog.fifo
 never-swap
-pidfile= /var/run/mozdefmqwSyslog/mqwSyslog.pid
+pidfile = /var/run/mozdefmqwSyslog/mqwSyslog.pid
 vacuum = true
 enable-threads

systemdfiles/mozdefmqwdeispapertrail.service

@@ -0,0 +1,21 @@
+[Unit]
+Description=uWSGI mozdef mqwDeisPapertrail
+After=syslog.target
+
+[Service]
+# Requires systemd version 211 or newer
+PermissionsStartOnly=true
+ExecStartPre=-/usr/bin/mkdir /var/run/mozdefmqwDeisPapertrail
+ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdefmqwDeisPapertrail
+User=mozdef
+Group=mozdef
+ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/mq; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini mqwDeisPapertrail.ini'
+Restart=always
+KillSignal=SIGQUIT
+Type=notify
+StandardError=syslog
+NotifyAccess=all
+
+[Install]
+WantedBy=multi-user.target
+Alias=mqwdeispapertrail

systemdfiles/mozdefmqwfxaprod.service

@@ -0,0 +1,21 @@
+[Unit]
+Description=uWSGI mozdef mqwFXAProd
+After=syslog.target
+
+[Service]
+# Requires systemd version 211 or newer
+PermissionsStartOnly=true
+ExecStartPre=-/usr/bin/mkdir /var/run/mozdefmqwFxaProd
+ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdefmqwFxaProd
+User=mozdef
+Group=mozdef
+ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/mq; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini mqwFxaProd.ini'
+Restart=always
+KillSignal=SIGQUIT
+Type=notify
+StandardError=syslog
+NotifyAccess=all
+
+[Install]
+WantedBy=multi-user.target
+Alias=mqwfxaprod

systemdfiles/mozdefmqwinfosecsqsprod.service

@@ -0,0 +1,21 @@
+[Unit]
+Description=uWSGI mozdef mqwInfosecSQSProd
+After=syslog.target
+
+[Service]
+# Requires systemd version 211 or newer
+PermissionsStartOnly=true
+ExecStartPre=-/usr/bin/mkdir /var/run/mozdefmqwInfosecSQSProd
+ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdefmqwInfosecSQSProd
+User=mozdef
+Group=mozdef
+ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/mq; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini mqwInfosecSQSProd.ini'
+Restart=always
+KillSignal=SIGQUIT
+Type=notify
+StandardError=syslog
+NotifyAccess=all
+
+[Install]
+WantedBy=multi-user.target
+Alias=mqwinfosecsqsprod

systemdfiles/mozdefmqwnubisprod.service

@@ -0,0 +1,21 @@
+[Unit]
+Description=uWSGI mozdef mqwNubisProd
+After=syslog.target
+
+[Service]
+# Requires systemd version 211 or newer
+PermissionsStartOnly=true
+ExecStartPre=-/usr/bin/mkdir /var/run/mozdefmqwNubisProd
+ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdefmqwNubisProd
+User=mozdef
+Group=mozdef
+ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/mq; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini mqwNubisProd.ini'
+Restart=always
+KillSignal=SIGQUIT
+Type=notify
+StandardError=syslog
+NotifyAccess=all
+
+[Install]
+WantedBy=multi-user.target
+Alias=mqwnubisprod