Browse Source

Fixed Debian codename

bugfixes
gau1991 10 years ago
parent
commit
fde03958b0
  1. 2
      ee/cli/plugins/secure.py
  2. 6
      ee/cli/plugins/stack.py
  3. 2
      ee/core/variables.py

2
ee/cli/plugins/secure.py

@ -90,7 +90,7 @@ class EESecureController(CementBaseController):
"{port} default_server ssl spdy;/\" " "{port} default_server ssl spdy;/\" "
"/etc/nginx/sites-available/22222.conf" "/etc/nginx/sites-available/22222.conf"
.format(port=self.app.pargs.user_input)) .format(port=self.app.pargs.user_input))
if EEVariables.ee_platform_distro == 'Debian': if EEVariables.ee_platform_distro == 'debian':
EEShellExec.cmd_exec(self, "sed -i \"s/listen.*/listen " EEShellExec.cmd_exec(self, "sed -i \"s/listen.*/listen "
"{port} default_server ssl;/\" " "{port} default_server ssl;/\" "
"/etc/nginx/sites-available/22222.conf" "/etc/nginx/sites-available/22222.conf"

6
ee/cli/plugins/stack.py

@ -106,7 +106,7 @@ class EEStackController(CementBaseController):
if set(EEVariables.ee_nginx).issubset(set(apt_packages)): if set(EEVariables.ee_nginx).issubset(set(apt_packages)):
Log.info(self, "Adding repository for Nginx") Log.info(self, "Adding repository for Nginx")
if EEVariables.ee_platform_distro == 'Debian': if EEVariables.ee_platform_distro == 'debian':
Log.debug(self, 'Adding Dotdeb/nginx GPG key') Log.debug(self, 'Adding Dotdeb/nginx GPG key')
EERepo.add(self, repo_url=EEVariables.ee_nginx_repo) EERepo.add(self, repo_url=EEVariables.ee_nginx_repo)
else: else:
@ -115,8 +115,8 @@ class EEStackController(CementBaseController):
if set(EEVariables.ee_php).issubset(set(apt_packages)): if set(EEVariables.ee_php).issubset(set(apt_packages)):
Log.info(self, "Adding repository for PHP") Log.info(self, "Adding repository for PHP")
if EEVariables.ee_platform_distro == 'Debian': if EEVariables.ee_platform_distro == 'debian':
Log.debug(self, 'Adding repo_url of php for Debian') Log.debug(self, 'Adding repo_url of php for debian')
EERepo.add(self, repo_url=EEVariables.ee_php_repo) EERepo.add(self, repo_url=EEVariables.ee_php_repo)
Log.debug(self, 'Adding Dotdeb/php GPG key') Log.debug(self, 'Adding Dotdeb/php GPG key')
EERepo.add_key(self, '89DF5277') EERepo.add_key(self, '89DF5277')

2
ee/core/variables.py

@ -67,7 +67,7 @@ class EEVariables():
# Nginx repo and packages # Nginx repo and packages
if ee_platform_distro == 'Ubuntu': if ee_platform_distro == 'Ubuntu':
ee_nginx_repo = "ppa:rtcamp/nginx" ee_nginx_repo = "ppa:rtcamp/nginx"
elif ee_platform_distro == 'Debian': elif ee_platform_distro == 'debian':
ee_nginx_repo = ("deb http://packages.dotdeb.org {codename} all" ee_nginx_repo = ("deb http://packages.dotdeb.org {codename} all"
.format(codename=ee_platform_codename)) .format(codename=ee_platform_codename))
ee_nginx = ["nginx-custom"] ee_nginx = ["nginx-custom"]

Loading…
Cancel
Save