Commit cfdbb13c authored by Patrick J Cherry's avatar Patrick J Cherry
Browse files

Merge branch 'jessie' of gitlab.bytemark.co.uk:bytemark/symbiosis into jessie

parents 8892ea7f 4f3264a6
......@@ -240,6 +240,16 @@ Symbiosis::Domains.each(prefix) do |domain|
configurations << this_config
end
#
# Sometimes, significant memory pressure can cause Etc.getpwuid(@uid).name
# to fail. symbiosis-httpd-configure is then led to believe there aren't any
# domains and will delete all sites from sites-enabled. Exit instead.
#
if configurations.empty?
verbose "\tNo domains detected. This could be due to memory pressure. Exiting."
exit 1
end
#
# Now see to the mass hosting stuff.
#
......@@ -359,7 +369,10 @@ configurations.each do |config|
else
verbose "\tConfiguration is up-to date."
next
if config.enabled?(sites_enabled_file)
next
end
end
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment