Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lisa Casino
slapos.core
Commits
dc269566
Commit
dc269566
authored
Oct 15, 2015
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapgrid firewalld: use supervisord to control dbus process
parent
e76f964f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
50 additions
and
3 deletions
+50
-3
slapos/grid/slapgrid.py
slapos/grid/slapgrid.py
+50
-3
No files found.
slapos/grid/slapgrid.py
View file @
dc269566
...
@@ -175,6 +175,8 @@ def merged_options(args, configp):
...
@@ -175,6 +175,8 @@ def merged_options(args, configp):
"firewall_cmd"
,
"firewall-cmd"
)
"firewall_cmd"
,
"firewall-cmd"
)
options
[
'firewall'
][
'firewall_executable'
]
=
options
[
'firewall'
].
get
(
options
[
'firewall'
][
'firewall_executable'
]
=
options
[
'firewall'
].
get
(
"firewall_executable"
,
""
)
"firewall_executable"
,
""
)
options
[
'firewall'
][
'dbus_executable'
]
=
options
[
'firewall'
].
get
(
"dbus_executable"
,
""
)
options
[
'firewall'
][
'reload_config_cmd'
]
=
options
[
'firewall'
].
get
(
options
[
'firewall'
][
'reload_config_cmd'
]
=
options
[
'firewall'
].
get
(
"reload_config_cmd"
,
"reload_config_cmd"
,
"slapos node restart firewall"
)
"slapos node restart firewall"
)
...
@@ -398,6 +400,7 @@ class Slapgrid(object):
...
@@ -398,6 +400,7 @@ class Slapgrid(object):
directory=/opt/slapos
directory=/opt/slapos
command=%(firewall_executable)s
command=%(firewall_executable)s
process_name=firewall
process_name=firewall
priority=5
autostart=true
autostart=true
autorestart=true
autorestart=true
startsecs=0
startsecs=0
...
@@ -419,9 +422,52 @@ stderr_logfile_backups=1
...
@@ -419,9 +422,52 @@ stderr_logfile_backups=1
'log_file'
:
self
.
firewall_conf
.
get
(
'log_file'
,
'/var/log/firewall.log'
)}
'log_file'
:
self
.
firewall_conf
.
get
(
'log_file'
,
'/var/log/firewall.log'
)}
if
not
os
.
path
.
exists
(
supervisord_conf_folder_path
):
if
not
os
.
path
.
exists
(
supervisord_conf_folder_path
):
os
.
makedirs
(
supervisord_conf_folder_path
)
os
.
makedirs
(
supervisord_conf_folder_path
)
updateFile
(
updateFile
(
supervisord_firewall_conf
,
supervisord_firewall_program_conf
)
supervisord_firewall_conf
,
supervisord_firewall_program_conf
)
def
_generateDbusSupervisorConf
(
self
):
"""If dbus command is defined in slapos configuration, generate
supervisor configuration entry for dbus daemon.
"""
supervisord_conf_folder_path
=
os
.
path
.
join
(
self
.
instance_root
,
'etc'
,
'supervisord.conf.d'
)
supervisord_dbus_conf
=
os
.
path
.
join
(
supervisord_conf_folder_path
,
'dbus.conf'
)
if
not
self
.
firewall_conf
or
not
self
.
firewall_conf
.
get
(
'dbus_executable'
)
\
or
self
.
firewall_conf
.
get
(
'testing'
,
False
):
if
os
.
path
.
exists
(
supervisord_dbus_conf
):
os
.
unlink
(
supervisord_dbus_conf
)
return
supervisord_dbus_program_conf
=
"""
\
[program:dbus]
directory=/opt/slapos
command=%(dbus_executable)s
process_name=dbus
priority=1
autostart=true
autorestart=true
startsecs=0
startretries=0
exitcodes=0
stopsignal=TERM
stopwaitsecs=60
user=0
group=0
serverurl=AUTO
redirect_stderr=true
stdout_logfile=%(dbus_log_file)s
stdout_logfile_maxbytes=100KB
stdout_logfile_backups=1
stderr_logfile=%(dbus_log_file)s
stderr_logfile_maxbytes=100KB
stderr_logfile_backups=1
"""
%
{
'dbus_executable'
:
self
.
firewall_conf
[
'dbus_executable'
],
'dbus_log_file'
:
self
.
firewall_conf
.
get
(
'dbus_log_file'
,
'/var/log/dbus.log'
)}
if
not
os
.
path
.
exists
(
supervisord_conf_folder_path
):
os
.
makedirs
(
supervisord_conf_folder_path
)
updateFile
(
supervisord_dbus_conf
,
supervisord_dbus_program_conf
)
def
checkEnvironmentAndCreateStructure
(
self
):
def
checkEnvironmentAndCreateStructure
(
self
):
"""Checks for software_root and instance_root existence, then creates
"""Checks for software_root and instance_root existence, then creates
...
@@ -433,6 +479,7 @@ stderr_logfile_backups=1
...
@@ -433,6 +479,7 @@ stderr_logfile_backups=1
createSupervisordConfiguration
(
self
.
instance_root
,
self
.
_getWatchdogLine
())
createSupervisordConfiguration
(
self
.
instance_root
,
self
.
_getWatchdogLine
())
self
.
_generateFirewallSupervisorConf
()
self
.
_generateFirewallSupervisorConf
()
self
.
_generateDbusSupervisorConf
()
def
_launchSupervisord
(
self
):
def
_launchSupervisord
(
self
):
if
not
self
.
forbid_supervisord_automatic_launch
:
if
not
self
.
forbid_supervisord_automatic_launch
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment