sunet-cert/soc-ops
0
0
Fork 0
Code Pull requests Activity

Fixes for intelmq-api.

Browse source
This commit is contained in:
Johan Björklund 2024-11-18 13:14:49 +01:00
parent c1428408d8
commit cec27244e1
Signed by: bjorklund
GPG key ID: 5E8401339C7F5037
5 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
global/overlay/etc/puppet/modules/soc/files/intelmq/api-config.json
View file

@ -1,7 +1,7 @@
{ {
"intelmq_ctl_cmd": ["sudo", "-u", "intelmq", "/opt/intelmq/venv/bin/intelmqctl"], "intelmq_ctl_cmd": ["sudo", "-u", "intelmq", "/opt/intelmq/venv/bin/intelmqctl"],
"allowed_path": "/opt/intelmq/var/lib/bots/", "allowed_path": "/opt/intelmq/var/lib/bots/",
"session_store": "/etc/intelmq/api-session.sqlite", "session_store": "/etc/intelmq/api/api-session.sqlite",
"session_duration": 86400, "session_duration": 86400,
"allow_origins": ["*"] "allow_origins": ["*"]
} }

2
global/overlay/etc/puppet/modules/soc/files/intelmq/intelmq-api.service
View file

@ -13,7 +13,7 @@ User=www-data
Group=www-data Group=www-data
RuntimeDirectory=gunicorn RuntimeDirectory=gunicorn
WorkingDirectory=/opt/intelmq/venv/lib/python3.11/site-packages/intelmq_api WorkingDirectory=/opt/intelmq/venv/lib/python3.11/site-packages/intelmq_api
ExecStart=/opt/intelmq/venv/bin/gunicorn intelmq_api.main:app --workers 4 --worker-class uvicorn.workers.UvicornWorker --bind unix:intelmq_api.sock --log-level DEBUG ExecStart=/opt/intelmq/venv/bin/gunicorn intelmq_api.main:app --workers 4 --worker-class uvicorn.workers.UvicornWorker --bind unix:/var/run/intelmq_api.sock --log-level DEBUG
ExecReload=/bin/kill -s HUP $MAINPID ExecReload=/bin/kill -s HUP $MAINPID
KillMode=mixed KillMode=mixed
TimeoutStopSec=5 TimeoutStopSec=5

2
global/overlay/etc/puppet/modules/soc/files/intelmq/intelmq-api.socket
View file

@ -2,7 +2,7 @@
Description=The socket to handle IntelMQ API requests Description=The socket to handle IntelMQ API requests
[Socket] [Socket]
ListenStream=/opt/intelmq/venv/lib/python3.11/site-packages/intelmq_api/intelmq_api.sock ListenStream=/var/run/intelmq_api.sock
SocketUser=www-data SocketUser=www-data
[Install] [Install]

11
global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp
View file

@ -26,6 +26,13 @@ class soc::intelmq(
group => 'intelmq', group => 'intelmq',
} }
file { '/etc/intelmq/api':
ensure => directory,
owner => 'intelmq',
gorup => 'www-data',
mode => '0770',
}
# file { '/opt/sso/apache/groups.txt': # file { '/opt/sso/apache/groups.txt':
# ensure => file, # ensure => file,
# content => template('soc/sso/apache-groups.txt.erb') # content => template('soc/sso/apache-groups.txt.erb')
@ -112,10 +119,10 @@ class soc::intelmq(
$api_pass = lookup('intelmq_api_user.password', undef, undef, 'pass') $api_pass = lookup('intelmq_api_user.password', undef, undef, 'pass')
exec { 'Setup intelmq-api user': exec { 'Setup intelmq-api user':
command => "sudo -u intelmq /opt/intelmq/venv/bin/intelmq-api-adduser --user ${api_user} --password ${api_pass}", command => "sudo -u intelmq /opt/intelmq/venv/bin/intelmq-api-adduser --user ${api_user} --password ${api_pass}",
creates => '/etc/intelmq/api-session.sqlite', creates => '/etc/intelmq/api/api-session.sqlite',
} }
file { '/etc/intelmq/api-session.sqlite': file { '/etc/intelmq/api/api-session.sqlite':
ensure => 'present', ensure => 'present',
replace => 'no', replace => 'no',
owner => 'intelmq', owner => 'intelmq',

4
global/overlay/etc/puppet/modules/soc/templates/intelmq/intelmq-vhost.conf.erb
View file

@ -72,8 +72,8 @@
</Directory> </Directory>
<Location /intelmq/> <Location /intelmq/>
ProxyPass unix:/opt/intelmq/venv/lib/python3.11/site-packages/intelmq_api/intelmq_api.sock|http://127.0.0.1/ ProxyPass unix:/var/run/intelmq_api.sock
ProxyPassReverse unix:/opt/intelmq/venv/lib/python3.11/site-packages/intelmq_api/intelmq_api.sock|http://127.0.0.1/ ProxyPassReverse unix:/var/run/intelmq_api.sock
</Location> </Location>
ErrorLog ${APACHE_LOG_DIR}/error.log ErrorLog ${APACHE_LOG_DIR}/error.log