branch develop updated (86ac6c3 -> 488d527)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository mum. See http://git.chorem.org/mum.git from 86ac6c3 reload de hostpage après changement + suppr warning au lancement de l'appli new d10b9d6 changement du nom du fichier de conf et génération automatique de celui-ci lors de l'installation avec le script bootstrap.sh new 488d527 suppression de mum.conf The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 488d5273a129d2e26e5e580afe56ea6c5571ff24 Author: Alexis Guilbaud <guilbaud@codelutin.com> Date: Fri Mar 13 12:08:34 2015 +0100 suppression de mum.conf commit d10b9d6d47e28edbc9f1f6a9edc67a35c7766b42 Author: Alexis Guilbaud <guilbaud@codelutin.com> Date: Fri Mar 13 12:05:43 2015 +0100 changement du nom du fichier de conf et génération automatique de celui-ci lors de l'installation avec le script bootstrap.sh Summary of changes: README | 6 ++++-- app/module_loader.py | 2 +- bootstrap.sh | 13 +++++++++++++ conf.txt | 3 --- 4 files changed, 18 insertions(+), 6 deletions(-) delete mode 100644 conf.txt -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository mum. See http://git.chorem.org/mum.git commit d10b9d6d47e28edbc9f1f6a9edc67a35c7766b42 Author: Alexis Guilbaud <guilbaud@codelutin.com> Date: Fri Mar 13 12:05:43 2015 +0100 changement du nom du fichier de conf et génération automatique de celui-ci lors de l'installation avec le script bootstrap.sh --- README | 6 ++++-- app/module_loader.py | 2 +- bootstrap.sh | 13 +++++++++++++ conf.txt => mum.conf | 0 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/README b/README index 0a56a93..b9a1583 100644 --- a/README +++ b/README @@ -25,7 +25,9 @@ You need also Virtualenv: sudo pip install virtualenv Install python dependancies (needs Pip): -./boostrap.sh +./bootstrap.sh + +edit mum.conf Launch the server : ./run.sh @@ -42,7 +44,7 @@ delete bower_components folder bower install -edit conf.txt +edit mum.conf remove database diff --git a/app/module_loader.py b/app/module_loader.py index 0c8aa74..7a7f494 100644 --- a/app/module_loader.py +++ b/app/module_loader.py @@ -23,7 +23,7 @@ class ModuleLoader: """ def __init__(self, add_func, rem_func): dict_conf = {} # See conf.txt - fconf = open('conf.txt', 'r') + fconf = open('mum.conf', 'r') for line in fconf.read().splitlines(): fields = line.split('=') dict_conf[fields[0]] = fields[1] diff --git a/bootstrap.sh b/bootstrap.sh index 3d44c5e..d3e4e99 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -2,7 +2,20 @@ venv/bin/python --version >/dev/null 2>&1 || virtualenv venv ./in-venv.sh pip install -r requirements.txt + +# changing bottle templates in order to make it compatible with angularJS sed -i 's/{{/[[/g' venv/bin/bottle.py sed -i 's/}}/]]/g' venv/bin/bottle.py sed -i 's/{{/[[/g' venv/lib/python2.7/site-packages/bottle.py sed -i 's/}}/]]/g' venv/lib/python2.7/site-packages/bottle.py + +#creating the configuration file +touch toto.conf +echo "db_location=$HOME/.mum/mum.db" >> toto.conf +echo "external_modules_location=$HOME/.mum/external" >> toto.conf +echo "keys_location=$HOME/.mum/keys/" >> toto.conf + +# creating the basic folders +mkdir $HOME/.mum +mkdir $HOME/.mum/external +mkdir $HOME/.mum/keys \ No newline at end of file diff --git a/conf.txt b/mum.conf similarity index 100% rename from conf.txt rename to mum.conf -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository mum. See http://git.chorem.org/mum.git commit 488d5273a129d2e26e5e580afe56ea6c5571ff24 Author: Alexis Guilbaud <guilbaud@codelutin.com> Date: Fri Mar 13 12:08:34 2015 +0100 suppression de mum.conf --- mum.conf | 3 --- 1 file changed, 3 deletions(-) diff --git a/mum.conf b/mum.conf deleted file mode 100644 index 3235010..0000000 --- a/mum.conf +++ /dev/null @@ -1,3 +0,0 @@ -db_location=mum.db -external_modules_location=/home/aguilbaud/external -keys_location=keys/ \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm