Browse Source

Addded all configurations into git

bugfixes
gau1991 10 years ago
parent
commit
8408838ba2
  1. 15
      ee/cli/plugins/stack.py

15
ee/cli/plugins/stack.py

@ -11,6 +11,7 @@ from ee.core.apt_repo import EERepo
from ee.core.extract import EEExtract from ee.core.extract import EEExtract
from ee.core.mysql import EEMysql from ee.core.mysql import EEMysql
from ee.core.addswap import EESwap from ee.core.addswap import EESwap
from ee.core.git import EEGit
from pynginxconfig import NginxConfig from pynginxconfig import NginxConfig
import random import random
import string import string
@ -141,6 +142,8 @@ class EEStackController(CementBaseController):
def post_pref(self, apt_packages, packages): def post_pref(self, apt_packages, packages):
if len(apt_packages): if len(apt_packages):
if set(EEVariables.ee_postfix).issubset(set(apt_packages)): if set(EEVariables.ee_postfix).issubset(set(apt_packages)):
EEGit.add(self, ["/etc/postfix"],
msg="Adding Postfix into Git")
pass pass
if set(EEVariables.ee_nginx).issubset(set(apt_packages)): if set(EEVariables.ee_nginx).issubset(set(apt_packages)):
if ((not os.path.isfile('/etc/nginx/conf.d/ee-nginx.conf')) and if ((not os.path.isfile('/etc/nginx/conf.d/ee-nginx.conf')) and
@ -250,6 +253,8 @@ class EEStackController(CementBaseController):
self.app.render((data), 'wpsubdir.mustache', self.app.render((data), 'wpsubdir.mustache',
out=ee_nginx) out=ee_nginx)
ee_nginx.close() ee_nginx.close()
EEGit.add(self,
["/etc/nginx"], msg="Adding Nginx into Git")
if set(EEVariables.ee_php).issubset(set(apt_packages)): if set(EEVariables.ee_php).issubset(set(apt_packages)):
# Create log directories # Create log directories
@ -310,6 +315,7 @@ class EEStackController(CementBaseController):
self.app.log.debug("writting PHP5 configartion into " self.app.log.debug("writting PHP5 configartion into "
" /etc/php5/fpm/pool.d/debug.conf") " /etc/php5/fpm/pool.d/debug.conf")
config.write(confifile) config.write(confifile)
EEGit.add(self, ["/etc/php5"], msg="Adding PHP into Git")
if set(EEVariables.ee_mysql).issubset(set(apt_packages)): if set(EEVariables.ee_mysql).issubset(set(apt_packages)):
config = configparser.ConfigParser() config = configparser.ConfigParser()
@ -319,6 +325,7 @@ class EEStackController(CementBaseController):
config['mysqld']['performance_schema'] = 0 config['mysqld']['performance_schema'] = 0
with open('/etc/mysql/my.cnf', 'w') as configfile: with open('/etc/mysql/my.cnf', 'w') as configfile:
config.write(configfile) config.write(configfile)
EEGit.add(self, ["/etc/mysql"], msg="Adding Nginx into Git")
if set(EEVariables.ee_mail).issubset(set(apt_packages)): if set(EEVariables.ee_mail).issubset(set(apt_packages)):
self.app.log.debug("Executing mail commands") self.app.log.debug("Executing mail commands")
@ -429,6 +436,8 @@ class EEStackController(CementBaseController):
"/dovecot") "/dovecot")
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"],
msg="Installed mail server")
if set(EEVariables.ee_mailscanner).issubset(set(apt_packages)): if set(EEVariables.ee_mailscanner).issubset(set(apt_packages)):
# Set up Custom amavis configuration # Set up Custom amavis configuration
@ -463,6 +472,7 @@ class EEStackController(CementBaseController):
EEShellExec.cmd_exec(self, "freshclam") EEShellExec.cmd_exec(self, "freshclam")
self.app.log.debug("Restarting service clamav-daemon") self.app.log.debug("Restarting service clamav-daemon")
EEShellExec.cmd_exec(self, "service clamav-daemon restart") EEShellExec.cmd_exec(self, "service clamav-daemon restart")
EEGit.add(self, ["/etc/amavis"], msg="Adding Amvis into Git")
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):
@ -742,6 +752,11 @@ class EEStackController(CementBaseController):
pass pass
# apt_packages = apt_packages + EEVariables.ee_nginx # apt_packages = apt_packages + EEVariables.ee_nginx
if self.app.pargs.mail: if self.app.pargs.mail:
self.app.pargs.nginx = True
self.app.pargs.php = True
self.app.pargs.mysql = True
self.app.pargs.postfix = True
if not EEAptGet.is_installed('dovecot'): if not EEAptGet.is_installed('dovecot'):
self.app.log.debug("Setting apt_packages variable for mail") self.app.log.debug("Setting apt_packages variable for mail")
apt_packages = apt_packages + EEVariables.ee_mail apt_packages = apt_packages + EEVariables.ee_mail

Loading…
Cancel
Save