projects
/
mdk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7b94464
)
WIP vhost support
author
Cameron Ball
<cameron@moodle.com>
Wed, 15 Jun 2016 12:16:25 +0000
(20:16 +0800)
committer
Cameron Ball
<cameron@moodle.com>
Wed, 24 Aug 2016 05:31:07 +0000
(13:31 +0800)
mdk/moodle.py
patch
|
blob
|
history
diff --git
a/mdk/moodle.py
b/mdk/moodle.py
index
92513be
..
e9a3227
100644
(file)
--- a/
mdk/moodle.py
+++ b/
mdk/moodle.py
@@
-86,7
+86,7
@@
class Moodle(object):
if type(value) == bool:
value = 'true' if value else 'false'
elif type(value) != int:
if type(value) == bool:
value = 'true' if value else 'false'
elif type(value) != int:
- value = "'" + str(value) + "'"
+ value = "'" + str(value)
.replace('%instancename%', self.identifier)
+ "'"
value = str(value)
try:
value = str(value)
try:
@@
-328,10
+328,10
@@
class Moodle(object):
self.removeConfig('behat_wwwroot')
else:
# Defining wwwroot.
self.removeConfig('behat_wwwroot')
else:
# Defining wwwroot.
- wwwroot = '%s://%s
/
' % (C.get('scheme'), C.get('behat.host'))
+ wwwroot = '%s://%s' % (C.get('scheme'), C.get('behat.host'))
if C.get('path') != '' and C.get('path') != None:
if C.get('path') != '' and C.get('path') != None:
- wwwroot = wwwroot + C.get('path')
+ '/'
- wwwroot = wwwroot + self.identifier
+ wwwroot = wwwroot + C.get('path')
+
#
wwwroot = wwwroot + self.identifier
currentWwwroot = self.get('behat_wwwroot')
if not currentWwwroot or force:
self.updateConfig('behat_wwwroot', wwwroot)
currentWwwroot = self.get('behat_wwwroot')
if not currentWwwroot or force:
self.updateConfig('behat_wwwroot', wwwroot)
@@
-426,6
+426,9
@@
class Moodle(object):
if isinstance(forceCfg, dict):
for cfgKey, cfgValue in forceCfg.iteritems():
try:
if isinstance(forceCfg, dict):
for cfgKey, cfgValue in forceCfg.iteritems():
try:
+ if isinstance(cfgValue, basestring):
+ cfgValue = cfgValue.replace('%instancename%', self.identifier)
+
logging.info('Setting up forced $CFG->%s to \'%s\' in config.php', cfgKey, cfgValue)
self.addConfig(cfgKey, cfgValue)
except Exception:
logging.info('Setting up forced $CFG->%s to \'%s\' in config.php', cfgKey, cfgValue)
self.addConfig(cfgKey, cfgValue)
except Exception: