Download as
Browse Code »

Commit 0242d0ea7e7070536815ba7f31eee606c71441f2

Authored by André Araújo
1 parent 3bc66c90
Exists in master

Atualiza Makefile

Showing 2 changed files with 5 additions and 5 deletions   Show diff stats
Makefile
  Diff comments   View file @0242d0e
1 1 PROJECT_NAME = wikilibras
2 2 VLIBRAS_WIKILIBRAS_ENV := /etc/profile.d/lavid/vlibras/wikilibras_env.sh
3   -PYBOSSA_CONF = /etc/apache2/sites-available/pybossa.conf
4   -PROJECT_DIR = $(CURDIR)
  3 +PROJECT_DIR := $(CURDIR)
5 4 SED_REPLACE_ALL = sed -i "s/$(1)/$(2)/g" "$(3)"
6 5 SED_REPLACE_ALL_PATH = sed -i "s\#$(1)\#$(2)\#g" "$(3)"
7 6  
... ... @@ -23,7 +22,7 @@ endif
23 22 install: uninstall config env
24 23  
25 24 env:
26   - @( \
  25 + @ ( \
27 26 virtualenv ./env/; \
28 27 . ./env/bin/activate; \
29 28 pip install -U pip; \
... ... @@ -52,7 +51,7 @@ endif
52 51 @ $(call SED_REPLACE_ALL,user1,$$USER,./contrib/apache/${PROJECT_NAME}.conf)
53 52 @ $(call SED_REPLACE_ALL,group1,$$USER,./contrib/apache/${PROJECT_NAME}.conf)
54 53 @ $(call SED_REPLACE_ALL_PATH,<path-to-project>,${PROJECT_DIR},./contrib/apache/${PROJECT_NAME}.conf)
55   - @ sudo cp -u ${PYBOSSA_CONF} /etc/apache2/sites-available/wikilibras.conf
  54 + @ sudo cp -u "/etc/apache2/sites-available/pybossa.conf" /etc/apache2/sites-available/wikilibras.conf
56 55 @ if grep -q "WSGIScriptAlias /${PROJECT_NAME}" "/etc/apache2/sites-available/wikilibras.conf"; \
57 56 then \
58 57 echo "\33[33;1mA previous WSGI daemon definition for '${PROJECT_NAME}' in: /etc/apache2/sites-available/wikilibras.conf\33[0m"; \
... ... @@ -84,4 +83,4 @@ run:
84 83 @ ( \
85 84 . ./env/bin/activate; \
86 85 python main.py; \
87   - )
  86 + )
... ...
settings_local.py.tmpl
  Diff comments   View file @0242d0e
1 1 # -*- coding: utf-8 -*-
  2 +
2 3 # WikiLibras Server Configuration
3 4 SERVER_HOST = "localhost"
4 5 SERVER_PORT = 8003
... ...