Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Workaround for WSL

Browse Source
This commit is contained in:
VirtuBox
2019-07-30 12:24:56 +02:00
parent 7a9379228f
commit 943ebf3d01
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
wo/cli/plugins/stack.py
View File

@@ -1044,10 +1044,10 @@ class WOStackController(CementBaseController):
" 49000 50000") " 49000 50000")
# proftpd TLS configuration # proftpd TLS configuration
if not os.path.isdir("/etc/proftpd/ssl"): if not os.path.isdir("/etc/proftpd/ssl"):
os.makedirs("/etc/proftpd/ssl") WOFileUtils.mkdir(self, "/etc/proftpd/ssl")
try: try:
WOShellExec.cmd_exec(self, "openssl genrsa -out " WOShellExec.cmd_exec(self, "openssl genrsa -out "
"/etc/proftpd/ssl/proftpd.key 2048") "/etc/proftpd/ssl/proftpd.key 2048")
WOShellExec.cmd_exec(self, "openssl req -new -batch " WOShellExec.cmd_exec(self, "openssl req -new -batch "
"-subj /commonName=localhost/ " "-subj /commonName=localhost/ "
"-key /etc/proftpd/ssl/proftpd.key " "-key /etc/proftpd/ssl/proftpd.key "
@@ -1055,21 +1055,19 @@ class WOStackController(CementBaseController):
WOFileUtils.mvfile(self, "/etc/proftpd/ssl/proftpd.key", WOFileUtils.mvfile(self, "/etc/proftpd/ssl/proftpd.key",
"/etc/proftpd/ssl/proftpd.key.org") "/etc/proftpd/ssl/proftpd.key.org")
WOShellExec.cmd_exec(self, "openssl rsa -in " WOShellExec.cmd_exec(self, "openssl rsa -in "
"/etc/proftpd/ssl/proftpd.key.org" "/etc/proftpd/ssl/proftpd.key.org"
"-out /etc/proftpd/ssl/proftpd.key") "-out /etc/proftpd/ssl/proftpd.key")
WOShellExec.cmd_exec(self, "openssl x509 -req -days " WOShellExec.cmd_exec(self, "openssl x509 -req -days "
"3652 -in /etc/proftpd/ssl/" "3652 -in /etc/proftpd/ssl/proftpd.csr"
"proftpd.csr" "-signkey /etc/proftpd/ssl/proftpd.key"
"-signkey /etc/proftpd/ssl/" " -out /etc/proftpd/ssl/proftpd.crt")
"proftpd.key"
" -out /etc/proftpd/ssl/proftpd.crt")
except CommandExecutionError as e: except CommandExecutionError as e:
Log.debug(self, "{0}".format(e)) Log.debug(self, "{0}".format(e))
Log.error( Log.error(
self, "Failed to generate SSL " self, "Failed to generate SSL "
"certificate for Proftpd") "certificate for Proftpd")
WOFileUtils.chmod(self, "/etc/proftpd/ssl/proftpd.key", 0o600) WOFileUtils.chmod(self, "/etc/proftpd/ssl/proftpd.key", 0o700)
WOFileUtils.chmod(self, "/etc/proftpd/ssl/proftpd.crt", 0o600) WOFileUtils.chmod(self, "/etc/proftpd/ssl/proftpd.crt", 0o700)
data = dict() data = dict()
Log.debug(self, 'Writting the proftpd configuration to ' Log.debug(self, 'Writting the proftpd configuration to '
'file /etc/proftpd/tls.conf') 'file /etc/proftpd/tls.conf')
@@ -1708,7 +1706,12 @@ class WOStackController(CementBaseController):
Log.debug(self, "Calling pre_pref") Log.debug(self, "Calling pre_pref")
self.pre_pref(apt_packages) self.pre_pref(apt_packages)
if (apt_packages): if (apt_packages):
WOSwap.add(self) meminfo = (os.popen('cat /proc/meminfo '
'| grep MemTotal').read()).split(" ")
memsplit = (meminfo[1]).split(" ")
wo_mem = int(mem[0])
if wo_mem < 4000000:
WOSwap.add(self)
Log.info(self, "Updating apt-cache, please wait...") Log.info(self, "Updating apt-cache, please wait...")
WOAptGet.update(self) WOAptGet.update(self)
Log.info(self, "Installing packages, please wait...") Log.info(self, "Installing packages, please wait...")