Random fixes

This commit is contained in:
Marc Aymerich 2016-05-26 08:15:34 +00:00
parent 1265881fbf
commit 76c8610d30
6 changed files with 24 additions and 7 deletions

View File

@ -285,7 +285,10 @@ class MailmanTraffic(ServiceMonitor):
try: try:
with open(postlog, 'r') as postlog: with open(postlog, 'r') as postlog:
for line in postlog.readlines(): for line in postlog.readlines():
month, day, time, year, __, __, __, list_name, __, addr, size = line.split()[:11] line = line.split()
if len(line) < 11:
continue
month, day, time, year, __, __, __, list_name, __, addr, size = line[:11]
try: try:
list = lists[list_name] list = lists[list_name]
except KeyError: except KeyError:

View File

@ -30,9 +30,10 @@ PROCESS_STATE_COLORS = {
} }
class PaymentSourceAdmin(SelectPluginAdminMixin, AccountAdminMixin, admin.ModelAdmin): class PaymentSourceAdmin(SelectPluginAdminMixin, AccountAdminMixin, ExtendedModelAdmin):
list_display = ('label', 'method', 'number', 'account_link', 'is_active') list_display = ('label', 'method', 'number', 'account_link', 'is_active')
list_filter = ('method', 'is_active') list_filter = ('method', 'is_active')
change_readonly_fields = ('method',)
search_fields = ('account__username', 'account__full_name', 'data') search_fields = ('account__username', 'account__full_name', 'data')
plugin = PaymentMethod plugin = PaymentMethod
plugin_field = 'method' plugin_field = 'method'

View File

@ -77,7 +77,7 @@ class PhpListSaaSController(ServiceController):
UPDATE phplist_user_user SET password="%(digest)s" where ID=1;' \\ UPDATE phplist_user_user SET password="%(digest)s" where ID=1;' \\
%(db_name)s""") % context %(db_name)s""") % context
sys.stdout.write('cmd: %s\n' % cmd) sys.stdout.write('cmd: %s\n' % cmd)
sshrun(server.get_address(), cmd) sshrun(server.get_address(), cmd, persist=True)
def save(self, saas): def save(self, saas):
if hasattr(saas, 'password'): if hasattr(saas, 'password'):

View File

@ -70,12 +70,15 @@ class WebApp(models.Model):
def get_directive(self): def get_directive(self):
return self.type_instance.get_directive() return self.type_instance.get_directive()
def get_path(self): def get_base_path(self):
context = { context = {
'home': self.get_user().get_home(), 'home': self.get_user().get_home(),
'app_name': self.name, 'app_name': self.name,
} }
path = settings.WEBAPPS_BASE_DIR % context return settings.WEBAPPS_BASE_DIR % context
def get_path(self):
path = self.get_base_path()
public_root = self.options.filter(name='public-root').first() public_root = self.options.filter(name='public-root').first()
if public_root: if public_root:
path = os.path.join(path, public_root.value) path = os.path.join(path, public_root.value)

View File

@ -1,3 +1,4 @@
import os
import re import re
from functools import lru_cache from functools import lru_cache
@ -58,7 +59,7 @@ class PHPAppOption(AppOption):
abstract = True abstract = True
def validate(self): def validate(self):
super(PHPAppOption, self).validate() super().validate()
if self.deprecated: if self.deprecated:
php_version = self.instance.webapp.type_instance.get_php_version_number() php_version = self.instance.webapp.type_instance.get_php_version_number()
if php_version and self.deprecated and float(php_version) > self.deprecated: if php_version and self.deprecated and float(php_version) > self.deprecated:
@ -74,6 +75,15 @@ class PublicRoot(AppOption):
regex = r'[^ ]+' regex = r'[^ ]+'
group = AppOption.FILESYSTEM group = AppOption.FILESYSTEM
def validate(self):
super().validate()
base_path = self.instance.webapp.get_base_path()
path = os.path.join(base_path, self.instance.value)
if not os.path.abspath(path).startswith(base_path):
raise ValidationError(
_("Public root path '%s' outside of webapp base path '%s'") % (path, base_path)
)
class Timeout(AppOption): class Timeout(AppOption):
name = 'timeout' name = 'timeout'

View File

@ -160,13 +160,13 @@ def run(command, display=False, valid_codes=(0,), silent=False, stdin=b'', async
def sshrun(addr, command, *args, executable='bash', persist=False, options=None, **kwargs): def sshrun(addr, command, *args, executable='bash', persist=False, options=None, **kwargs):
from .. import settings
base_options = { base_options = {
'stricthostkeychecking': 'no', 'stricthostkeychecking': 'no',
'BatchMode': 'yes', 'BatchMode': 'yes',
'EscapeChar': 'none', 'EscapeChar': 'none',
} }
if persist: if persist:
from .. import settings
base_options.update({ base_options.update({
'ControlMaster': 'auto', 'ControlMaster': 'auto',
'ControlPersist': 'yes', 'ControlPersist': 'yes',