Browse Source

Added PMA

bugfixes
gau1991 10 years ago
parent
commit
78bfca6919
  1. 20
      ee/cli/plugins/stack.py
  2. 3
      ee/core/extract.py

20
ee/cli/plugins/stack.py

@ -8,11 +8,16 @@ from ee.core.download import EEDownload
from ee.core.shellexec import EEShellExec from ee.core.shellexec import EEShellExec
from ee.core.fileutils import EEFileUtils from ee.core.fileutils import EEFileUtils
from ee.core.apt_repo import EERepo from ee.core.apt_repo import EERepo
from ee.core.extract import EEExtract
from pynginxconfig import NginxConfig from pynginxconfig import NginxConfig
import random import random
import string import string
import configparser import configparser
import time import time
import shutil
import os
import pwd
import grp
def ee_stack_hook(app): def ee_stack_hook(app):
@ -43,6 +48,8 @@ class EEStackController(CementBaseController):
dict(help='Install Postfix stack', action='store_true')), dict(help='Install Postfix stack', action='store_true')),
(['--wpcli'], (['--wpcli'],
dict(help='Install WPCLI stack', action='store_true')), dict(help='Install WPCLI stack', action='store_true')),
(['--phpmyadmin'],
dict(help='Install PHPMyAdmin stack', action='store_true')),
] ]
@expose(hide=True) @expose(hide=True)
@ -160,6 +167,15 @@ class EEStackController(CementBaseController):
if len(packages): if len(packages):
if any('/usr/bin/wp' == x[1] for x in packages): if any('/usr/bin/wp' == x[1] for x in packages):
EEShellExec.cmd_exec("chmod +x /usr/bin/wp") EEShellExec.cmd_exec("chmod +x /usr/bin/wp")
if any('/tmp/pma.tar.gz' == x[1]
for x in packages):
EEExtract.extract('/tmp/pma.tar.gz', '/tmp/')
if not os.path.exists('/var/www/22222/htdocs/db'):
os.makedirs('/var/www/22222/htdocs/db')
shutil.move('/tmp/phpmyadmin-STABLE/',
'/var/www/22222/htdocs/db/pma/')
EEShellExec.cmd_exec('chown -R www-data:www-data '
'/var/www/22222/htdocs/db/pma')
pass pass
@expose() @expose()
@ -189,6 +205,10 @@ class EEStackController(CementBaseController):
packages = packages + [["https://github.com/wp-cli/wp-cli/releases" packages = packages + [["https://github.com/wp-cli/wp-cli/releases"
"/download/v0.17.1/wp-cli.phar", "/download/v0.17.1/wp-cli.phar",
"/usr/bin/wp"]] "/usr/bin/wp"]]
if self.app.pargs.phpmyadmin:
packages = packages + [["https://github.com/phpmyadmin/phpmyadmin"
"/archive/STABLE.tar.gz",
"/tmp/pma.tar.gz"]]
self.pre_pref(apt_packages) self.pre_pref(apt_packages)
if len(apt_packages): if len(apt_packages):

3
ee/core/extract.py

@ -1,4 +1,6 @@
"""EasyEngine extarct core classes.""" """EasyEngine extarct core classes."""
import tarfile
import os
class EEExtract(): class EEExtract():
@ -9,6 +11,7 @@ class EEExtract():
tar = tarfile.open(file) tar = tarfile.open(file)
tar.extractall(path=path) tar.extractall(path=path)
tar.close() tar.close()
os.remove(file)
return True return True
except tarfile.TarError as e: except tarfile.TarError as e:
print("Unable to extract file "+file) print("Unable to extract file "+file)

Loading…
Cancel
Save