';
- });
- return new Handlebars.SafeString(html);
- });
-
- Handlebars.registerHelper('display_newVolumes', function(){
- var html = '';
- for (share in this.new_volumes) {
- html += '
';
- html += '
Share
';
- html += '
' + this.new_volumes[share] + '
';
- html += '
' + share + '
';
- html += '
';
- }
- return new Handlebars.SafeString(html);
- });
-
- Handlebars.registerHelper('display_ports', function(){
- var html = '';
- this.ports.each(function(port, index) {
- html += '
';
- html += '
Port
';
- html += '
' + port.get('hostp') + '
';
- html += '
' + port.get('containerp') + '
';
- html += '
';
- });
- return new Handlebars.SafeString(html);
- });
-
- Handlebars.registerHelper('display_cc', function(){
- var html = '';
- this.cc.each(function(cci, index) {
- html += '
';
+ });
+ return new Handlebars.SafeString(html);
+ });
+
+ Handlebars.registerHelper('display_newVolumes', function(){
+ var html = '';
+ for (share in this.new_volumes) {
+ html += '
';
+ html += '
Share
';
+ html += '
' + this.new_volumes[share] + '
';
+ html += '
' + share + '
';
+ html += '
';
+ }
+ return new Handlebars.SafeString(html);
+ });
+
+ Handlebars.registerHelper('display_ports', function(){
+ var html = '';
+ this.ports.each(function(port, index) {
+ html += '
';
+ html += '
Port
';
+ html += '
' + port.get('hostp') + '
';
+ html += '
' + port.get('containerp') + '
';
+ html += '
';
+ });
+ return new Handlebars.SafeString(html);
+ });
+
+ Handlebars.registerHelper('display_cc', function(){
+ var html = '';
+ this.cc.each(function(cci, index) {
+ html += '
';
+ html += '
Custom
';
+ html += '
' + cci.get('val') + '
';
+ html += '
' + cci.get('key') + '
';
+ html += '
';
+ });
+ //@todo: separate env and cc stuff.
+ this.env.each(function(envi, index) {
+ html += '
Env
';
+ html += '
' + envi.get('val') + '
';
+ html += '
' + envi.get('key') + '
';
+ });
+ return new Handlebars.SafeString(html);
+ });
+
+ }
});
RockonSettingsComplete = RockstorWizardPage.extend({
- initialize: function() {
- this.template = window.JST.rockons_update_complete;
- this.rockon = this.model.get('rockon');
- this.shares = this.model.get('shares');
- RockstorWizardPage.prototype.initialize.apply(this, arguments);
- },
-
- render: function() {
- $(this.el).html(this.template({
- model: this.model
- }));
- return this;
- },
-
- save: function() {
- var _this = this;
- if (document.getElementById('next-page').disabled) return false;
- document.getElementById('next-page').disabled = true;
- return $.ajax({
- url: '/api/rockons/' + this.rockon.id + '/update',
- type: 'POST',
- dataType: 'json',
- contentType: 'application/json',
- data: JSON.stringify({
- 'shares': this.shares
- }),
- success: function() {}
- });
- }
+ initialize: function() {
+ this.template = window.JST.rockons_update_complete;
+ this.rockon = this.model.get('rockon');
+ this.shares = this.model.get('shares');
+ RockstorWizardPage.prototype.initialize.apply(this, arguments);
+ },
+
+ render: function() {
+ $(this.el).html(this.template({
+ model: this.model
+ }));
+ return this;
+ },
+
+ save: function() {
+ var _this = this;
+ if (document.getElementById('next-page').disabled) return false;
+ document.getElementById('next-page').disabled = true;
+ return $.ajax({
+ url: '/api/rockons/' + this.rockon.id + '/update',
+ type: 'POST',
+ dataType: 'json',
+ contentType: 'application/json',
+ data: JSON.stringify({
+ 'shares': this.shares
+ }),
+ success: function() {}
+ });
+ }
});
diff --git a/src/rockstor/storageadmin/urls/rockons.py b/src/rockstor/storageadmin/urls/rockons.py
index 44a3ecd91..0fcc34643 100644
--- a/src/rockstor/storageadmin/urls/rockons.py
+++ b/src/rockstor/storageadmin/urls/rockons.py
@@ -18,7 +18,8 @@
from django.conf.urls import patterns, url
from storageadmin.views import (RockOnView, RockOnIdView, RockOnVolumeView,
- RockOnPortView, RockOnCustomConfigView)
+ RockOnPortView, RockOnCustomConfigView,
+ RockOnEnvironmentView)
urlpatterns = patterns(
'',
@@ -26,6 +27,7 @@
url(r'^/volumes/(?P\d+)$', RockOnVolumeView.as_view(), ),
url(r'^/ports/(?P\d+)$', RockOnPortView.as_view(), ),
url(r'^/customconfig/(?P\d+)$', RockOnCustomConfigView.as_view(), ),
+ url(r'^/environment/(?P\d+)$', RockOnEnvironmentView.as_view(), ),
url(r'^/(?Pupdate)$', RockOnView.as_view(), ),
url(r'^/(?P\d+)$', RockOnIdView.as_view(), ),
url(r'^/(?P\d+)/(?Pinstall|uninstall|update|start|stop|state_update|status_update)$',
diff --git a/src/rockstor/storageadmin/views/__init__.py b/src/rockstor/storageadmin/views/__init__.py
index 88034ad37..89fed0751 100644
--- a/src/rockstor/storageadmin/views/__init__.py
+++ b/src/rockstor/storageadmin/views/__init__.py
@@ -47,6 +47,7 @@
from rockon_volume import RockOnVolumeView
from rockon_port import RockOnPortView
from rockon_custom_config import RockOnCustomConfigView
+from rockon_environment import RockOnEnvironmentView
from disk_smart import DiskSMARTDetailView
from config_backup import (ConfigBackupListView, ConfigBackupDetailView,
ConfigBackupUpload)
diff --git a/src/rockstor/storageadmin/views/rockon.py b/src/rockstor/storageadmin/views/rockon.py
index ecc7f271e..098d99c9c 100644
--- a/src/rockstor/storageadmin/views/rockon.py
+++ b/src/rockstor/storageadmin/views/rockon.py
@@ -21,7 +21,8 @@
from rest_framework.response import Response
from django.db import transaction
from storageadmin.models import (RockOn, DImage, DContainer, DPort, DVolume,
- ContainerOption, DCustomConfig, DContainerLink)
+ ContainerOption, DCustomConfig,
+ DContainerLink, DContainerEnv)
from storageadmin.serializers import RockOnSerializer
from storageadmin.util import handle_exception
import rest_framework_custom as rfc
@@ -149,128 +150,139 @@ def _create_update_meta(self, name, r_d):
if (not created):
co.dimage = io
co.launch_order = co_defaults['launch_order']
+ if ('uid' in c_d):
+ co.uid = int(c_d['uid'])
co.save()
- ports = {}
- if ('ports' in containers[c]):
- ports = containers[c]['ports']
- for p in ports:
- p_d = ports[p]
- if ('protocol' not in p_d):
- p_d['protocol'] = None
- p = int(p)
- po = None
- if (DPort.objects.filter(containerp=p, container=co).exists()):
- po = DPort.objects.get(containerp=p, container=co)
- po.hostp_default = p_d['host_default']
- po.description = p_d['description']
- po.protocol = p_d['protocol']
- po.label = p_d['label']
- else:
- #let's find next available default if default is already taken
- def_hostp = p_d['host_default']
- while (True):
- if (DPort.objects.filter(hostp=def_hostp).exists()):
- def_hostp += 1
- else:
- break
- po = DPort(description=p_d['description'],
- hostp=def_hostp, containerp=p,
- hostp_default=def_hostp,
- container=co,
- protocol=p_d['protocol'],
- label=p_d['label'])
- if ('ui' in p_d):
- po.uiport = p_d['ui']
- if (po.uiport):
- ro.ui = True
- ro.save()
- po.save()
+ ports = containers[c].get('ports', {})
+ for p in ports:
+ p_d = ports[p]
+ if ('protocol' not in p_d):
+ p_d['protocol'] = None
+ p = int(p)
+ po = None
+ if (DPort.objects.filter(containerp=p, container=co).exists()):
+ po = DPort.objects.get(containerp=p, container=co)
+ po.hostp_default = p_d['host_default']
+ po.description = p_d['description']
+ po.protocol = p_d['protocol']
+ po.label = p_d['label']
+ else:
+ #let's find next available default if default is already taken
+ def_hostp = p_d['host_default']
+ while (True):
+ if (DPort.objects.filter(hostp=def_hostp).exists()):
+ def_hostp += 1
+ else:
+ break
+ po = DPort(description=p_d['description'],
+ hostp=def_hostp, containerp=p,
+ hostp_default=def_hostp,
+ container=co,
+ protocol=p_d['protocol'],
+ label=p_d['label'])
+ if ('ui' in p_d):
+ po.uiport = p_d['ui']
+ if (po.uiport):
+ ro.ui = True
+ ro.save()
+ po.save()
ports = [int(p) for p in ports]
for po in DPort.objects.filter(container=co):
if (po.containerp not in ports):
po.delete()
- v_d = {}
- if ('volumes' in c_d):
- v_d = c_d['volumes']
- for v in v_d:
- cv_d = v_d[v]
- vo_defaults = {'description': cv_d['description'],
- 'label': cv_d['label']}
- vo, created = DVolume.objects.get_or_create(dest_dir=v, container=co,
- defaults=vo_defaults)
- if (not created):
- vo.description = vo_defaults['description']
- vo.label = vo_defaults['label']
- if ('min_size' in cv_d):
- vo.min_size = cv_d['min_size']
- vo.save()
+ v_d = c_d.get('volumes', {})
+ for v in v_d:
+ cv_d = v_d[v]
+ vo_defaults = {'description': cv_d['description'],
+ 'label': cv_d['label']}
+ vo, created = DVolume.objects.get_or_create(dest_dir=v, container=co,
+ defaults=vo_defaults)
+ if (not created):
+ vo.description = vo_defaults['description']
+ vo.label = vo_defaults['label']
+ if ('min_size' in cv_d):
+ vo.min_size = cv_d['min_size']
+ vo.save()
for vo in DVolume.objects.filter(container=co):
if (vo.dest_dir not in v_d):
vo.delete()
- if ('opts' in containers[c]):
- options = containers[c]['opts']
- id_l = []
- for o in options:
- #there are no unique constraints on this model, so we need this bandaid.
- if (ContainerOption.objects.filter(container=co, name=o[0], val=o[1]).count() > 1):
- ContainerOption.objects.filter(container=co, name=o[0], val=o[1]).delete()
- oo, created = ContainerOption.objects.get_or_create(container=co,
- name=o[0],
- val=o[1])
- id_l.append(oo.id)
- for oo in ContainerOption.objects.filter(container=co):
- if (oo.id not in id_l):
- oo.delete()
+ self._update_env(co, c_d)
+ options = containers[c].get('opts', [])
+ id_l = []
+ for o in options:
+ #there are no unique constraints on this model, so we need this bandaid.
+ if (ContainerOption.objects.filter(container=co, name=o[0], val=o[1]).count() > 1):
+ ContainerOption.objects.filter(container=co, name=o[0], val=o[1]).delete()
+ oo, created = ContainerOption.objects.get_or_create(container=co,
+ name=o[0],
+ val=o[1])
+ id_l.append(oo.id)
+ for oo in ContainerOption.objects.filter(container=co):
+ if (oo.id not in id_l):
+ oo.delete()
- if ('container_links' in r_d):
- l_d = r_d['container_links']
- for cname in l_d:
- ll = l_d[cname]
- lsources = [l['source_container'] for l in ll]
- co = DContainer.objects.get(rockon=ro, name=cname)
- for clo in co.destination_container.all():
- if (clo.name not in lsources):
- clo.delete()
- for cl_d in ll:
- sco = DContainer.objects.get(rockon=ro, name=cl_d['source_container'])
- clo, created = DContainerLink.objects.get_or_create(source=sco,
- destination=co)
- clo.name = cl_d['name']
- clo.save()
+ l_d = r_d.get('container_links', {})
+ for cname in l_d:
+ ll = l_d[cname]
+ lsources = [l['source_container'] for l in ll]
+ co = DContainer.objects.get(rockon=ro, name=cname)
+ for clo in co.destination_container.all():
+ if (clo.name not in lsources):
+ clo.delete()
+ for cl_d in ll:
+ sco = DContainer.objects.get(rockon=ro, name=cl_d['source_container'])
+ clo, created = DContainerLink.objects.get_or_create(source=sco,
+ destination=co)
+ clo.name = cl_d['name']
+ clo.save()
+ self._update_cc(ro, r_d)
- cc_d = {}
- if ('custom_config' in r_d):
- cc_d = r_d['custom_config']
- sorted_keys = [''] * len(cc_d.keys())
- for k in cc_d:
- ccc_d = cc_d[k]
- idx = ccc_d.get('index', 0)
- if (idx == 0):
- for i in range(len(sorted_keys)):
- if (sorted_keys[i] == ''):
- sorted_keys[i] = k
- break
- else:
- sorted_keys[idx-1] = k
- for k in sorted_keys:
- ccc_d = cc_d[k]
- cco, created = DCustomConfig.objects.get_or_create(
- rockon=ro, key=k,
- defaults={'description': ccc_d['description'], 'label': ccc_d['label']})
- if (not created):
- cco.description = ccc_d['description']
- cco.label = ccc_d['label']
- cco.save()
- def_val = ccc_d.get('default')
- if (def_val is not None):
- cco.val = def_val
- cco.save()
+
+ def _sorted_keys(self, cd):
+ sorted_keys = [''] * len(cd.keys())
+ for k in cd:
+ ccd = cd[k]
+ idx = ccd.get('index', 0)
+ if (idx == 0):
+ for i in range(len(sorted_keys)):
+ if (sorted_keys[i] == ''):
+ sorted_keys[i] = k
+ break
+ else:
+ sorted_keys[idx-1] = k
+ return sorted_keys
+
+ def _update_model(self, modelinst, ad):
+ for k,v in ad.iteritems():
+ setattr(modelinst, k, v)
+ modelinst.save()
+
+ def _update_cc(self, ro, r_d):
+ cc_d = r_d.get('custom_config', {})
+ for k in self._sorted_keys(cc_d):
+ ccc_d = cc_d[k]
+ defaults = {'description': ccc_d['description'],
+ 'label': ccc_d['label'], }
+ cco, created = DCustomConfig.objects.get_or_create(
+ rockon=ro, key=k, defaults=defaults)
+ if (not created): self._update_model(cco, defaults)
for cco in DCustomConfig.objects.filter(rockon=ro):
- if (cco.key not in cc_d):
- cco.delete()
+ if (cco.key not in cc_d): cco.delete()
+
+ def _update_env(self, co, c_d):
+ cc_d = c_d.get('environment', {})
+ for k in self._sorted_keys(cc_d):
+ ccc_d = cc_d[k]
+ defaults = {'description': ccc_d['description'],
+ 'label': ccc_d['label'], }
+ cco, created = DContainerEnv.objects.get_or_create(
+ container=co, key=k, defaults=defaults)
+ if (not created): self._update_model(cco, defaults)
+ for eo in DContainerEnv.objects.filter(container=co):
+ if (eo.key not in cc_d): eo.delete()
def _get_available(self, request):
msg = ('Network error while checking for updates. '
diff --git a/src/rockstor/storageadmin/views/rockon_environment.py b/src/rockstor/storageadmin/views/rockon_environment.py
new file mode 100644
index 000000000..24048a376
--- /dev/null
+++ b/src/rockstor/storageadmin/views/rockon_environment.py
@@ -0,0 +1,36 @@
+"""
+Copyright (c) 2012-2013 RockStor, Inc.
+This file is part of RockStor.
+
+RockStor is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published
+by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+RockStor is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see .
+"""
+
+from storageadmin.models import (RockOn, DContainer, DContainerEnv)
+from storageadmin.serializers import RockOnEnvironmentSerializer
+import rest_framework_custom as rfc
+from storageadmin.util import handle_exception
+
+
+class RockOnEnvironmentView(rfc.GenericView):
+ serializer_class = RockOnEnvironmentSerializer
+
+ def get_queryset(self, *args, **kwargs):
+ try:
+ rockon = RockOn.objects.get(id=self.kwargs['rid'])
+ except:
+ e_msg = ('Rock-on(%s) does not exist' % self.kwargs['rid'])
+ handle_exception(Exception(e_msg), self.request)
+
+ containers = DContainer.objects.filter(rockon=rockon)
+ return DContainerEnv.objects.filter(container__in=containers).order_by('id')
diff --git a/src/rockstor/storageadmin/views/rockon_helpers.py b/src/rockstor/storageadmin/views/rockon_helpers.py
index ed44720fd..2dabcb822 100644
--- a/src/rockstor/storageadmin/views/rockon_helpers.py
+++ b/src/rockstor/storageadmin/views/rockon_helpers.py
@@ -29,7 +29,7 @@
from system.services import service_status
from storageadmin.models import (RockOn, DContainer, DVolume, DPort,
DCustomConfig, Share, Disk, DContainerLink,
- ContainerOption)
+ ContainerOption, DContainerEnv)
from fs.btrfs import mount_share
from system.pkg_mgmt import install_pkg
from rockon_utils import container_status
@@ -183,15 +183,37 @@ def vol_ops(container):
ops_list.extend(['-v', '%s:%s' % (share_mnt, v.dest_dir)])
return ops_list
+def vol_owner_uid(container):
+ # If there are volumes, return the uid of the owner of the first volume.
+ vo = DVolume.objects.filter(container=container).first()
+ if (vo is None): return None
+ share_mnt = ('%s%s' % (settings.MNT_PT, vo.share.name))
+ return os.stat(share_mnt).st_uid
+
+def envars(container):
+ var_list = []
+ for e in DContainerEnv.objects.filter(container=container):
+ var_list.extend(['-e', '%s=%s' % (e.key, e.val)])
+ return var_list
+
def generic_install(rockon):
for c in DContainer.objects.filter(rockon=rockon).order_by('launch_order'):
+ rm_container(c.name)
cmd = list(DCMD2) + ['--name', c.name,]
cmd.extend(vol_ops(c))
+ if (c.uid is not None):
+ uid = c.uid
+ if (c.uid is -1):
+ uid = vol_owner_uid(c)
+ #@todo: what if the uid does not exist? Create a user with username=container-name?
+ cmd.extend(['-u', str(uid)])
cmd.extend(port_ops(c))
cmd.extend(container_ops(c))
+ cmd.extend(envars(c))
cmd.append(c.dimage.name)
run_command(cmd)
+
def openvpn_install(rockon):
#volume container
vol_co = DContainer.objects.get(rockon=rockon, launch_order=1)
@@ -214,23 +236,17 @@ def openvpn_install(rockon):
run_command(server_cmd)
-def transmission_install(rockon):
- co = DContainer.objects.get(rockon=rockon, launch_order=1)
- cmd = list(DCMD2) + ['--name', co.name]
- for cco in DCustomConfig.objects.filter(rockon=rockon):
- cmd.extend(['-e', '%s=%s' % (cco.key, cco.val)])
- cmd.extend(vol_ops(co))
- cmd.extend(port_ops(co))
- cmd.append(co.dimage.name)
- run_command(cmd)
-
-
def owncloud_install(rockon):
for c in DContainer.objects.filter(rockon=rockon).order_by('launch_order'):
+ rm_container(c.name)
cmd = list(DCMD2) + ['--name', c.name, ]
db_user = DCustomConfig.objects.get(rockon=rockon, key='db_user').val
db_pw = DCustomConfig.objects.get(rockon=rockon, key='db_pw').val
if (c.dimage.name == 'postgres'):
+ #change permissions on the db volume to 700
+ vo = DVolume.objects.get(container=c)
+ share_mnt = ('%s%s' % (settings.MNT_PT, vo.share.name))
+ run_command(['/usr/bin/chmod', '700', share_mnt])
cmd.extend(['-e', 'POSTGRES_USER=%s' % db_user, '-e',
'POSTGRES_PASSWORD=%s' % db_pw])
cmd.extend(port_ops(c))
diff --git a/src/rockstor/storageadmin/views/rockon_id.py b/src/rockstor/storageadmin/views/rockon_id.py
index e8b427715..336f482b0 100644
--- a/src/rockstor/storageadmin/views/rockon_id.py
+++ b/src/rockstor/storageadmin/views/rockon_id.py
@@ -21,7 +21,7 @@
from django.db import transaction
from django.db.models import Q
from storageadmin.models import (RockOn, DContainer, DVolume, Share, DPort,
- DCustomConfig)
+ DCustomConfig, DContainerEnv)
from storageadmin.serializers import RockOnSerializer
import rest_framework_custom as rfc
from storageadmin.util import handle_exception
@@ -82,6 +82,7 @@ def post(self, request, rid, command):
share_map = request.data.get('shares', {})
port_map = request.data.get('ports', {})
cc_map = request.data.get('cc', {})
+ env_map = request.data.get('environment', {})
containers = DContainer.objects.filter(rockon=rockon)
for co in containers:
for s in share_map.keys():
@@ -118,6 +119,13 @@ def post(self, request, rid, command):
cco = DCustomConfig.objects.get(rockon=rockon, key=c)
cco.val = cc_map[c]
cco.save()
+ for e in env_map.keys():
+ if (not DContainerEnv.objects.filter(container=co, key=e).exists()):
+ e_msg = ('Invalid environment variabled(%s)' % e)
+ handle_exception(Exception(e_msg), request)
+ ceo = DContainerEnv.objects.get(container=co, key=e)
+ ceo.val = env_map[e]
+ ceo.save()
install.async(rockon.id)
rockon.state = 'pending_install'
rockon.save()