Fix redis.conf permissions and missing import glob

This commit is contained in:
VirtuBox
2019-08-08 23:41:28 +02:00
parent 81fd382784
commit 4819b26aa4
7 changed files with 16 additions and 10 deletions

View File

@@ -1,5 +1,5 @@
sudo: required sudo: required
dist: bionic dist: xenial
language: bash language: bash
@@ -30,7 +30,7 @@ script:
- unset LANG - unset LANG
- sudo bash -c 'echo -e "[user]\n\tname = abc\n\temail = root@localhost.com" > /home/travis/.gitconfig' - sudo bash -c 'echo -e "[user]\n\tname = abc\n\temail = root@localhost.com" > /home/travis/.gitconfig'
- sudo echo "Travis Banch = $TRAVIS_BRANCH" - sudo echo "Travis Banch = $TRAVIS_BRANCH"
- sudo apt-get install -qq --force-yes git python3-setuptools python3-dev python3-apt ccze tree - sudo apt-get install --assume-yes --quiet git python3-setuptools python3-dev python3-apt ccze tree
- sudo bash install --travis - sudo bash install --travis
- sudo wo --help && sudo wo stack install && sudo wo stack install --proftpd - sudo wo --help && sudo wo stack install && sudo wo stack install --proftpd
- sudo wo site create html.net --html && sudo wo site create php.com --php && sudo wo site create mysql.com --mysql && sudo wo site create proxy.com --proxy=127.0.0.1:3000 - sudo wo site create html.net --html && sudo wo site create php.com --php && sudo wo site create mysql.com --mysql && sudo wo site create proxy.com --proxy=127.0.0.1:3000

View File

@@ -7,10 +7,10 @@
# Copyright (c) 2019 - WordOps # Copyright (c) 2019 - WordOps
# This script is licensed under M.I.T # This script is licensed under M.I.T
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
# Version 3.9.7 - 2019-08-02 # Version 3.9.7.1 - 2019-08-08
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
readonly wo_version_old="2.2.3" readonly wo_version_old="2.2.3"
readonly wo_version_new="3.9.7" readonly wo_version_new="3.9.7.1"
# CONTENTS # CONTENTS
# --- # ---
# 1. VARIABLES AND DECLARATIONS # 1. VARIABLES AND DECLARATIONS

View File

@@ -1 +1 @@
cement>=2.4.0 cement>=2.8.0

View File

@@ -56,7 +56,7 @@ if not os.path.isfile('/root/.gitconfig'):
shutil.copy2(os.path.expanduser("~")+'/.gitconfig', '/root/.gitconfig') shutil.copy2(os.path.expanduser("~")+'/.gitconfig', '/root/.gitconfig')
setup(name='wo', setup(name='wo',
version='3.9.7', version='3.9.7.1',
description=long_description, description=long_description,
long_description=long_description, long_description=long_description,
classifiers=[], classifiers=[],
@@ -77,14 +77,15 @@ setup(name='wo',
# "nose", # "nose",
# "coverage", # "coverage",
# Required to function # Required to function
'cement == 2.4', 'cement == 2.8.0',
'pystache', 'pystache',
'python-apt', 'python-apt',
'pynginxconfig', 'pynginxconfig',
'PyMySQL == 0.8.0', 'PyMySQL',
'psutil == 3.1.1', 'psutil',
'sh', 'sh',
'SQLAlchemy', 'SQLAlchemy',
'requests',
], ],
data_files=[('/etc/wo', ['config/wo.conf']), data_files=[('/etc/wo', ['config/wo.conf']),
('/etc/wo/plugins.d', conf), ('/etc/wo/plugins.d', conf),

View File

@@ -1792,6 +1792,10 @@ class WOStackController(CementBaseController):
"noeviction", "noeviction",
"maxmemory-policy " "maxmemory-policy "
"allkeys-lru") "allkeys-lru")
WOFileUtils.chown(self, '/etc/redis/redis.conf',
'redis',
'redis',
recursive=False)
WOService.restart_service(self, 'redis-server') WOService.restart_service(self, 'redis-server')
if 'mariadb-server' in apt_packages: if 'mariadb-server' in apt_packages:
# setting innodb memory usage # setting innodb memory usage

View File

@@ -4,6 +4,7 @@ from wo.core.fileutils import WOFileUtils
from wo.cli.plugins.sitedb import * from wo.cli.plugins.sitedb import *
from wo.core.mysql import * from wo.core.mysql import *
from wo.core.logging import Log from wo.core.logging import Log
import glob
def wo_sync_hook(app): def wo_sync_hook(app):

View File

@@ -10,7 +10,7 @@ class WOVariables():
"""Intialization of core variables""" """Intialization of core variables"""
# WordOps version # WordOps version
wo_version = "3.9.7" wo_version = "3.9.7.1"
# WordOps packages versions # WordOps packages versions
wo_wp_cli = "2.2.0" wo_wp_cli = "2.2.0"
wo_adminer = "4.7.2" wo_adminer = "4.7.2"