Updated pid path for all uwsgi instances to run from /var/run/

2016-12-26 12:51:22 -06:00 · 2016-12-26 12:51:22 -06:00 · b86413db27
--- a/alerts/supervisord.alerts.conf
+++ b/alerts/supervisord.alerts.conf
--- a/loginput/loginput.ini
+++ b/loginput/loginput.ini
@ -18,7 +18,7 @@ master-fifo = /opt/mozdef/envs/mozdef/loginput/loginput.fifo
 procname-master = [m]
 procname-prefix = [loginput]
 never-swap
-pidfile= /opt/mozdef/envs/mozdef/loginput/loginput.pid
+pidfile= /var/run/mozdef-loginput/loginput.pid
 vacuum = true
 reload-on-exception
 listen=100
--- a/mq/mqwAutoland.ini.disabled
+++ b/mq/mqwAutoland.ini.disabled
@ -14,6 +14,6 @@ procname-master = [m]
 procname-prefix = [mqwAutoland]
 master-fifo = /opt/mozdef/envs/mozdef/mq/mqwAutoland.fifo
 never-swap
-pidfile= /opt/mozdef/envs/mozdef/mq/mqwAutoland.pid
+pidfile= /var/run/mozdefmq/mqwAutoland.pid
 vacuum = true
 enable-threads
--- a/mq/mqwBroStage.ini
+++ b/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= /opt/mozdef/envs/mozdef/mq/mqwBroStage.pid
+pidfile= /var/run/mqwBroStage/mqwBroStage.pid
 vacuum = true
 enable-threads
--- a/mq/mqwFxaStage.ini.disabled
+++ b/mq/mqwFxaStage.ini.disabled
@ -14,6 +14,6 @@ master-fifo = /opt/mozdef/envs/mozdef/mq/mqwFxaStage.fifo
 procname-master = [m]
 procname-prefix = [mqwFxaStage]
 never-swap
-pidfile= /opt/mozdef/envs/mozdef/mq/mqwFxaStage.pid
+pidfile= /var/run/mozdefmq/mqwFxaStage.pid
 vacuum = true
 enable-threads
--- a/mq/mqwInfosecSQSNonProd.ini.disabled
+++ b/mq/mqwInfosecSQSNonProd.ini.disabled
@ -8,12 +8,12 @@ logto = /opt/mozdef/envs/mozdef/logs/uwsgi.mqESmules.infosecsqs.log
 ;
 log-drain = generated 0 bytes
 log-date = %%a %%b %%d %%H:%%M:%%S
-socket = /opt/mozdef/envs/mozdef/mq/mqESmulesInfosecSQSNonProd.socket
+socket = /opt/mozdef/envs/mozdef/mq/mqwInfosecSQSNonProd.socket
 virtualenv = /opt/mozdef/envs/mozdef/
-master-fifo = /opt/mozdef/envs/mozdef/mq/mqESmulesInfosecSQSNonProd.fifo
+master-fifo = /opt/mozdef/envs/mozdef/mq/mqwInfosecSQSNonProd.fifo
 procname-master = [m]
 procname-prefix = [mqwInfosecSQSNonProd]
 never-swap
-pidfile= /opt/mozdef/envs/mozdef/mq/mqESmulesInfosecSQSNonProd.pid
+pidfile= /var/run/mozdefmqwInfosecSQSNonProd/mqwInfosecSQSNonProd.pid
 vacuum = true
 enable-threads
--- a/mq/mqwNubisNonProd.ini.disabled
+++ b/mq/mqwNubisNonProd.ini.disabled
@ -13,6 +13,6 @@ master-fifo = /opt/mozdef/envs/mozdef/mq/mqwNubisNonProd.fifo
 procname-master = [m]
 procname-prefix = [mqwNubisNonProd]
 never-swap
-pidfile= /opt/mozdef/envs/mozdef/mq/mqwNubisNonProd.pid
+pidfile= /var/run/mozdefmqwNubisNonProd/mqwNubisNonProd.pid
 vacuum = true
 enable-threads
--- a/mq/mqwNubisProd.ini.disabled
+++ b/mq/mqwNubisProd.ini.disabled
@ -0,0 +1,18 @@
+[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.nubis.prod.conf
+daemonize = /opt/mozdef/envs/mozdef/logs/uwsgi.mqESmules.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
+virtualenv = /opt/mozdef/envs/mozdef/
+master-fifo = /opt/mozdef/envs/mozdef/mq/mqESmulesNubisProd.fifo
+never-swap
+pidfile= /opt/mozdef/envs/mozdef/mq/mqESmulesNubisProd.pid
+vacuum = true
+enable-threads
--- a/mq/mqwRelengPapertrail.ini.disabled
+++ b/mq/mqwRelengPapertrail.ini.disabled
@ -0,0 +1,19 @@
+[uwsgi]
+chdir = /opt/mozdef/envs/mozdef/mq/
+uid = mozdef
+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
+;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/mqwRelengPapertrail.socket
+virtualenv = /opt/mozdef/envs/mozdef/
+procname-master = [m]
+procname-prefix = [mqwRelengPapertrail]
+master-fifo = /opt/mozdef/envs/mozdef/mq/mqwRelengPapertrail.fifo
+never-swap
+pidfile= /var/run/mozdefmqwRelengPapertrail/mqwRelengPapertrail.pid
+vacuum = true
+enable-threads
--- a/mq/mqwSyslog.ini
+++ b/mq/mqwSyslog.ini
@ -2,17 +2,17 @@
 chdir = /opt/mozdef/envs/mozdef/mq/
 uid = mozdef
 mule = esworker.py
-pyargv = -c /opt/mozdef/envs/mozdef/mq/esworker.brostage.conf
-logto = /opt/mozdef/envs/mozdef/logs/uwsgi.mqwbrostage.log
+pyargv = -c /opt/mozdef/envs/mozdef/mq/esworker.syslog.conf
+logto = /opt/mozdef/envs/mozdef/logs/uwsgi.mqwsyslog.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/mqwBroStage.socket
+socket = /opt/mozdef/envs/mozdef/mq/mqwSyslog.socket
 virtualenv = /opt/mozdef/envs/mozdef/
 procname-master = [m]
-procname-prefix = [mqwBroStage]
-master-fifo = /opt/mozdef/envs/mozdef/mq/mqwBroStage.fifo
+procname-prefix = [mqwSyslog]
+master-fifo = /opt/mozdef/envs/mozdef/mq/mqwSyslog.fifo
 never-swap
-pidfile= /opt/mozdef/envs/mozdef/mq/mqwBroStage.pid
+pidfile= /var/run/mozdefmqwSyslog/mqwSyslog.pid
 vacuum = true
 enable-threads
--- a/rest/restapi.ini
+++ b/rest/restapi.ini
@ -17,5 +17,5 @@ procname-prefix = [restapi]
 master-fifo = /opt/mozdef/envs/mozdef/rest/restapi.fifo
 pyargv= -c /opt/mozdef/envs/mozdef/rest/index.conf
 never-swap
-pidfile= /opt/mozdef/envs/mozdef/rest/restapi.pid
+pidfile= /var/run/mozdef-rest/restapi.pid
 vacuum = true
--- a/systemdfiles/mongod.service
+++ b/systemdfiles/mongod.service
@ -4,14 +4,13 @@ After=network.target

 [Service]
 Type=forking
+PermissionsStartOnly=true
+ExecStartPre=-/usr/bin/mkdir /var/run/mozdefdb
+ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdefdb/
 PIDFile=/var/run/mozdefdb/mozdefdb.pid
-ExecStart=/usr/bin/mongod --config /etc/mongod.conf
+ExecStart=/usr/bin/mongod  --storageEngine=mmapv1 --config /etc/mongod.conf
 ExecReload=/bin/kill -HUP $MAINPID
-<<<<<<< HEAD
 Restart=always
-=======
-#Restart=always
->>>>>>> 8d519538b9afa92609f5afa587256e02a25a554e
 User=mozdef
 Group=mozdef
 StandardOutput=syslog
--- a/systemdfiles/mozdefalertplugins.service
+++ b/systemdfiles/mozdefalertplugins.service
@ -4,6 +4,9 @@ After=syslog.target

 [Service]
 # Requires systemd version 211 or newer
+PermissionsStartOnly=true
+ExecStartPre=-/usr/bin/mkdir /var/run/mozdef-alerts
+ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdef-alerts
 User=mozdef
 Group=mozdef
 ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/alerts; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini alertPlugins.ini'
--- a/systemdfiles/mozdefloginput.service
+++ b/systemdfiles/mozdefloginput.service
@ -4,6 +4,9 @@ After=syslog.target

 [Service]
 # Requires systemd version 211 or newer
+PermissionsStartOnly=true
+ExecStartPre=-/usr/bin/mkdir /var/run/mozdefloginput
+ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdefloginput/
 User=mozdef
 Group=mozdef
 ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/loginput; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini loginput.ini'
--- a/systemdfiles/mozdefmqwautoland.service
+++ b/systemdfiles/mozdefmqwautoland.service
@ -4,6 +4,9 @@ After=syslog.target

 [Service]
 # Requires systemd version 211 or newer
+PermissionsStartOnly=true
+ExecStartPre=-/usr/bin/mkdir /var/run/mozdefmqwAutoland
+ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdefmqAutoland
 User=mozdef
 Group=mozdef
 ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/mq; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini mqwAutoland.ini'
--- a/systemdfiles/mozdefmqwbrostage.service
+++ b/systemdfiles/mozdefmqwbrostage.service
@ -4,6 +4,9 @@ After=syslog.target

 [Service]
 # Requires systemd version 211 or newer
+PermissionsStartOnly=true
+ExecStartPre=-/usr/bin/mkdir /var/run/mozdefmqwBroStage
+ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdefmqwBroStage/
 User=mozdef
 Group=mozdef
 ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/mq; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini mqwBroStage.ini'
--- a/systemdfiles/mozdefmqwfxastage.service
+++ b/systemdfiles/mozdefmqwfxastage.service
@ -4,6 +4,9 @@ After=syslog.target

 [Service]
 # Requires systemd version 211 or newer
+PermissionsStartOnly=true
+ExecStartPre=-/usr/bin/mkdir /var/run/mozdefmqwFxaStage
+ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdefmqwFxaStage
 User=mozdef
 Group=mozdef
 ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/mq; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini mqwFxaStage.ini'
--- a/systemdfiles/mozdefmqwinfosecsqsnonprod.service
+++ b/systemdfiles/mozdefmqwinfosecsqsnonprod.service
@ -4,6 +4,9 @@ After=syslog.target

 [Service]
 # Requires systemd version 211 or newer
+PermissionsStartOnly=true
+ExecStartPre=-/usr/bin/mkdir /var/run/mozdefmqwInfosecSQSNonProd
+ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdefmqwInfosecSQSNonProd
 User=mozdef
 Group=mozdef
 ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/mq; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini mqwInfosecSQSNonProd.ini'
--- a/systemdfiles/mozdefmqwnubisnonprod.service
+++ b/systemdfiles/mozdefmqwnubisnonprod.service
@ -4,6 +4,9 @@ After=syslog.target

 [Service]
 # Requires systemd version 211 or newer
+PermissionsStartOnly=true
+ExecStartPre=-/usr/bin/mkdir /var/run/mozdefmqwNubisNonProd
+ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdefmqwNubisNonProd
 User=mozdef
 Group=mozdef
 ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/mq; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini mqwNubisNonProd.ini'
--- a/systemdfiles/mozdefmqwrelengpapertrail.service
+++ b/systemdfiles/mozdefmqwrelengpapertrail.service
@ -4,6 +4,9 @@ After=syslog.target

 [Service]
 # Requires systemd version 211 or newer
+PermissionsStartOnly=true
+ExecStartPre=-/usr/bin/mkdir /var/run/mozdefmqwRelengPapertrail
+ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdefmqwRelengPapertrail
 User=mozdef
 Group=mozdef
 ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/mq; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini mqwRelengPapertrail.ini'
--- a/systemdfiles/mozdefmqwsyslog.service
+++ b/systemdfiles/mozdefmqwsyslog.service
@ -4,6 +4,9 @@ After=syslog.target

 [Service]
 # Requires systemd version 211 or newer
+PermissionsStartOnly=true
+ExecStartPre=-/usr/bin/mkdir /var/run/mozdefmqwSyslog
+ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdefmqwSyslog
 User=mozdef
 Group=mozdef
 ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/mq; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini mqwSyslog.ini'
--- a/systemdfiles/mozdefrestapi.service
+++ b/systemdfiles/mozdefrestapi.service
@ -4,6 +4,9 @@ After=syslog.target

 [Service]
 # Requires systemd version 211 or newer
+PermissionsStartOnly=true
+ExecStartPre=-/usr/bin/mkdir /var/run/mozdef-rest
+ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdef-rest/
 User=mozdef
 Group=mozdef
 ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/rest; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini restapi.ini'