lukechilds
/
easyengine
mirror of https://github.com/lukechilds/easyengine.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Now using Python function for permission instead of shell

bugfixes
gau1991 10 years ago
parent
718f56ff14
commit
3722800156
1 changed files with 30 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 41
      ee/cli/plugins/stack.py

41
ee/cli/plugins/stack.py
View File

@ -518,8 +518,10 @@ class EEStackController(CementBaseController):
# Compile sieve rules # Compile sieve rules
self.app.log.debug("Privillages to dovecot ") self.app.log.debug("Privillages to dovecot ")
EEShellExec.cmd_exec(self, "chown -R vmail:vmail /var/lib" # EEShellExec.cmd_exec(self, "chown -R vmail:vmail /var/lib"
"/dovecot") # "/dovecot")
EEFileUtils.chown(self, "/var/lig/dovecot", "vmail", "vmail"
recursive=True)
EEShellExec.cmd_exec(self, "sievec /var/lib/dovecot/sieve/" EEShellExec.cmd_exec(self, "sievec /var/lib/dovecot/sieve/"
"default.sieve") "default.sieve")
EEGit.add(self, ["/etc/postfix", "/etc/dovecot"], EEGit.add(self, ["/etc/postfix", "/etc/dovecot"],
@ -582,8 +584,11 @@ class EEStackController(CementBaseController):
'/var/www/22222/htdocs/db/pma/') '/var/www/22222/htdocs/db/pma/')
self.app.log.debug('Privillages to www-data:www-data ' self.app.log.debug('Privillages to www-data:www-data '
'/var/www/22222/htdocs/db/pma ') '/var/www/22222/htdocs/db/pma ')
EEShellExec.cmd_exec(self, 'chown -R www-data:www-data ' # EEShellExec.cmd_exec(self, 'chown -R www-data:www-data '
'/var/www/22222/htdocs/db/pma') # '/var/www/22222/htdocs/db/pma')
EEFileUtils.chown(self, '/var/www/22222',
EEVariables.ee_php_user,
EEVariables.ee_php_user, recursive=True)
if any('/tmp/memcache.tar.gz' == x[1] if any('/tmp/memcache.tar.gz' == x[1]
for x in packages): for x in packages):
self.app.log.debug("Extracting memcache.tar.gz to location" self.app.log.debug("Extracting memcache.tar.gz to location"
@ -592,8 +597,11 @@ class EEStackController(CementBaseController):
'/var/www/22222/htdocs/cache/memcache') '/var/www/22222/htdocs/cache/memcache')
self.app.log.debug("Privillages to" self.app.log.debug("Privillages to"
" /var/www/22222/htdocs/cache/memcache") " /var/www/22222/htdocs/cache/memcache")
EEShellExec.cmd_exec(self, 'chown -R www-data:www-data ' # EEShellExec.cmd_exec(self, 'chown -R www-data:www-data '
'/var/www/22222/htdocs/cache/memcache') # '/var/www/22222/htdocs/cache/memcache')
EEFileUtils.chown(self, '/var/www/22222',
EEVariables.ee_php_user,
EEVariables.ee_php_user, recursive=True)
if any('/tmp/webgrind.tar.gz' == x[1] if any('/tmp/webgrind.tar.gz' == x[1]
for x in packages): for x in packages):
@ -608,8 +616,11 @@ class EEStackController(CementBaseController):
'/var/www/22222/htdocs/php/webgrind') '/var/www/22222/htdocs/php/webgrind')
self.app.log.debug("Privillages www-data:www-data " self.app.log.debug("Privillages www-data:www-data "
"/var/www/22222/htdocs/php/webgrind/ ") "/var/www/22222/htdocs/php/webgrind/ ")
EEShellExec.cmd_exec(self, 'chown -R www-data:www-data ' # EEShellExec.cmd_exec(self, 'chown -R www-data:www-data '
'/var/www/22222/htdocs/php/webgrind/') # '/var/www/22222/htdocs/php/webgrind/')
EEFileUtils.chown(self, '/var/www/22222',
EEVariables.ee_php_user,
EEVariables.ee_php_user, recursive=True)
if any('/tmp/anemometer.tar.gz' == x[1] if any('/tmp/anemometer.tar.gz' == x[1]
for x in packages): for x in packages):
@ -733,6 +744,10 @@ class EEStackController(CementBaseController):
"/bin/doctrine2-cli.php orm:schema-tool:" "/bin/doctrine2-cli.php orm:schema-tool:"
"create") "create")
EEFileUtils.chown(self, '/var/www/22222',
EEVariables.ee_php_user,
EEVariables.ee_php_user, recursive=True)
# Copy Dovecot and Postfix templates which are depednet on # Copy Dovecot and Postfix templates which are depednet on
# Vimbadmin # Vimbadmin
@ -865,8 +880,12 @@ class EEStackController(CementBaseController):
'webmail.error.log', 'webmail.error.log',
'/var/www/roundcubemail/' '/var/www/roundcubemail/'
'logs/error.log']) 'logs/error.log'])
# Remove roundcube installe[r # Remove roundcube installer
EEFileUtils.remove(self, ["/var/www/roundcubemail/installer"]) EEFileUtils.remove(self, ["/var/www/roundcubemail/installer"])
EEFileUtils.chown(self, '/var/www/roundcubemail',
EEVariables.ee_php_user,
EEVariables.ee_php_user, recursive=True)
EEService.reload_service(self, 'nginx') EEService.reload_service(self, 'nginx')
@expose() @expose()
@ -1023,8 +1042,8 @@ class EEStackController(CementBaseController):
packages = packages + ["/var/www/22222/htdocs/vimbadmin", packages = packages + ["/var/www/22222/htdocs/vimbadmin",
"/var/www/roundcubemail"] "/var/www/roundcubemail"]
if EEShellExec.cmd_exec("mysqladmin ping"): if EEShellExec.cmd_exec("mysqladmin ping"):
EEMysql.execute("drop database vimbadmin") EEMysql.execute("drop database IF EXISTS vimbadmin")
EEMysql.execute("drop database roundcubemail") EEMysql.execute("drop database IF EXISTS roundcubemail")
if self.app.pargs.nginx: if self.app.pargs.nginx:
self.app.log.debug("Removing apt_packages variable of Nginx") self.app.log.debug("Removing apt_packages variable of Nginx")

Write Preview
Loading…
Cancel
Save