fix other stack shmove

This commit is contained in:
VirtuBox
2019-04-03 07:15:17 +02:00
parent 8e9a7fabff
commit 71b7ada96e

View File

@@ -1101,9 +1101,11 @@ class WOStackController(CementBaseController):
.format(WOVariables.wo_webroot)) .format(WOVariables.wo_webroot))
os.makedirs('{0}22222/htdocs/php' os.makedirs('{0}22222/htdocs/php'
.format(WOVariables.wo_webroot)) .format(WOVariables.wo_webroot))
shutil.move('/tmp/webgrind-master/', if not os.path.exists('{0}22222/htdocs/php/webgrind'
'{0}22222/htdocs/php/webgrind' .format(WOVariables.wo_webroot)):
.format(WOVariables.wo_webroot)) shutil.move('/tmp/webgrind-master/',
'{0}22222/htdocs/php/webgrind'
.format(WOVariables.wo_webroot))
WOFileUtils.searchreplace(self, "{0}22222/htdocs/php/webgrind/" WOFileUtils.searchreplace(self, "{0}22222/htdocs/php/webgrind/"
"config.php" "config.php"
@@ -1139,16 +1141,18 @@ class WOStackController(CementBaseController):
Log.debug(self, "Creating directory") Log.debug(self, "Creating directory")
os.makedirs('{0}22222/htdocs/db/' os.makedirs('{0}22222/htdocs/db/'
.format(WOVariables.wo_webroot)) .format(WOVariables.wo_webroot))
shutil.move('/tmp/Anemometer-master', if not os.path.exists('{0}22222/htdocs/db/anemometer'
'{0}22222/htdocs/db/anemometer' .format(WOVariables.wo_webroot)):
.format(WOVariables.wo_webroot)) shutil.move('/tmp/Anemometer-master',
chars = ''.join(random.sample(string.ascii_letters, 8)) '{0}22222/htdocs/db/anemometer'
try: .format(WOVariables.wo_webroot))
WOShellExec.cmd_exec(self, 'mysql < {0}22222/htdocs/db' chars = ''.join(random.sample(string.ascii_letters, 8))
'/anemometer/install.sql' try:
.format(WOVariables.wo_webroot)) WOShellExec.cmd_exec(self, 'mysql < {0}22222/htdocs/db'
except CommandExecutionError as e: '/anemometer/install.sql'
raise SiteError("Unable to import Anemometer database") .format(WOVariables.wo_webroot))
except CommandExecutionError as e:
raise SiteError("Unable to import Anemometer database")
WOMysql.execute(self, 'grant select on *.* to \'anemometer\'' WOMysql.execute(self, 'grant select on *.* to \'anemometer\''
'@\'{0}\' IDENTIFIED' '@\'{0}\' IDENTIFIED'
@@ -1192,16 +1196,20 @@ class WOStackController(CementBaseController):
.format(WOVariables.wo_webroot)) .format(WOVariables.wo_webroot))
os.makedirs('{0}22222/htdocs/cache/redis' os.makedirs('{0}22222/htdocs/cache/redis'
.format(WOVariables.wo_webroot)) .format(WOVariables.wo_webroot))
shutil.move('/tmp/phpRedisAdmin-master/', if not os.path.exists('{0}22222/htdocs/cache/'
'{0}22222/htdocs/cache/redis/phpRedisAdmin' 'redis/phpRedisAdmin'
.format(WOVariables.wo_webroot)) .format(WOVariables.wo_webroot)):
shutil.move('/tmp/phpRedisAdmin-master/',
'{0}22222/htdocs/cache/redis/phpRedisAdmin'
.format(WOVariables.wo_webroot))
Log.debug(self, 'Extracting file /tmp/predis.tar.gz to ' Log.debug(self, 'Extracting file /tmp/predis.tar.gz to '
'loaction /tmp/') 'loaction /tmp/')
WOExtract.extract(self, '/tmp/predis.tar.gz', '/tmp/') WOExtract.extract(self, '/tmp/predis.tar.gz', '/tmp/')
shutil.move('/tmp/predis-1.0.1/', shutil.move('/tmp/predis-1.0.1/',
'{0}22222/htdocs/cache/redis/phpRedisAdmin/vendor' '{0}22222/htdocs/cache/redis/'
.format(WOVariables.wo_webroot)) 'phpRedisAdmin/vendor'
.format(WOVariables.wo_webroot))
Log.debug(self, 'Setting Privileges of webroot permission to ' Log.debug(self, 'Setting Privileges of webroot permission to '
'{0}22222/htdocs/cache/ file ' '{0}22222/htdocs/cache/ file '