Skip to content

Commit

Permalink
refresh network state before updating nginx in initrock. Fixes #1101
Browse files Browse the repository at this point in the history
  • Loading branch information
schakrava committed Jan 31, 2016
1 parent ec8050d commit 6b21a4f
Showing 1 changed file with 8 additions and 14 deletions.
22 changes: 8 additions & 14 deletions src/rockstor/scripts/initrock.py
Expand Up @@ -27,6 +27,9 @@
from tempfile import mkstemp
from django.conf import settings
from system.pkg_mgmt import downgrade_pkgs
from storageadmin.views.network import NetworkMixin
from storageadmin.models import NetworkInterface


logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -100,25 +103,16 @@ def init_update_issue():
'https://%s\n\n' % ipaddr)
return ipaddr


def update_nginx(logger):
from storageadmin.models import NetworkInterface
nm = NetworkMixin()
nm._refresh_ni()
try:
ni = NetworkInterface.objects.get(itype='management')
except NetworkInterface.DoesNotExist:
return logger.debug('management interface not configured. Not updating Nginx conf')
conf = '%s/etc/nginx/nginx.conf' % settings.ROOT_DIR
fo, npath = mkstemp()
with open(conf) as ifo, open(npath, 'w') as tfo:
for line in ifo.readlines():
if (re.search('listen.*80 default_server', line) is not None):
substr = 'listen %s:80' % ni.ipaddr
line = re.sub(r'listen.*80', substr, line)
elif (re.search('listen.*443 default_server', line) is not None):
substr = 'listen %s:443' % ni.ipaddr
line = re.sub(r'listen.*443', substr, line)
tfo.write(line)
shutil.move(npath, conf)
run_command([SUPERCTL, 'restart', 'nginx'])
nm._update_nginx(ni.ipaddr)


def set_def_kernel(logger, version=settings.SUPPORTED_KERNEL_VERSION):
supported_kernel_path = ('/boot/vmlinuz-%s' % version)
Expand Down

0 comments on commit 6b21a4f

Please sign in to comment.