Commit ab285f7a9c4d002af1fecb6e3f05b372bd38697c
1 parent
c2702d12
Exists in
master
Atualiza Makefile
Showing
1 changed file
with
32 additions
and
25 deletions
Show diff stats
Makefile
1 | -PROJECT_NAME = corretor | |
2 | -VLIBRAS_NAME = vlibras-wiki | |
3 | -PYBOSSA_CONF = /etc/apache2/sites-available/pybossa.conf | |
4 | -PROJECT_DIR = $(CURDIR) | |
5 | -SED_REPLACE_ALL = sed -i "s/$(1)/$(2)/g" "$(3)" | |
6 | -SED_REPLACE_ALL_PATH = sed -i "s\#$(1)\#$(2)\#g" "$(3)" | |
1 | +PROJECT_NAME = corretor | |
2 | +VLIBRAS_WIKILIBRAS_ENV := /etc/profile.d/lavid/vlibras/wikilibras_env.sh | |
3 | +PROJECT_DIR := $(CURDIR) | |
4 | +SED_REPLACE_ALL = sed -i "s/$(1)/$(2)/g" "$(3)" | |
5 | +SED_REPLACE_ALL_PATH = sed -i "s\#$(1)\#$(2)\#g" "$(3)" | |
6 | + | |
7 | +-include ${VLIBRAS_WIKILIBRAS_ENV} | |
7 | 8 | |
8 | 9 | ifndef LOCALHOST |
9 | 10 | ifndef NETWORK_INTERFACE |
10 | - NETWORK_INTERFACE := $(shell ip route | awk '{print $$5; exit}') | |
11 | + NETWORK_INTERFACE := $(shell ip route | grep "default" | awk '{print $$5; exit}') | |
11 | 12 | endif |
12 | 13 | ifdef NETWORK_INTERFACE |
13 | - LOCALHOST := $(shell ip addr list ${NETWORK_INTERFACE} | grep "inet " | cut -d ' ' -f6 | cut -d/ -f1) | |
14 | + LOCALHOST ?= $(shell ip route get 1 | awk '{print $$7; exit}') | |
14 | 15 | endif |
15 | 16 | endif |
16 | 17 | |
17 | 18 | ifndef LOCALHOST |
18 | - LOCALHOST := localhost | |
19 | + LOCALHOST ?= 127.0.0.1 | |
19 | 20 | endif |
20 | 21 | |
21 | -install: uninstall config | |
22 | - @( \ | |
22 | +install: uninstall config env | |
23 | + | |
24 | +env: | |
25 | + @ ( \ | |
23 | 26 | virtualenv ./env/; \ |
24 | 27 | . ./env/bin/activate; \ |
25 | 28 | pip install -U pip; \ |
... | ... | @@ -27,14 +30,14 @@ install: uninstall config |
27 | 30 | pip install -U ndg-httpsclient; \ |
28 | 31 | pip install -r requirements.txt; \ |
29 | 32 | ) |
33 | + | |
34 | +create_project update_project: | |
35 | + @ echo "http://${LOCALHOST}/${PROJECT_NAME}-backend/$@" | |
30 | 36 | ifdef PYBOSSA_API_KEY |
31 | - @ curl "http://${LOCALHOST}/${PROJECT_NAME}-backend/create_project" && echo "" | |
32 | - @ echo "http://${LOCALHOST}/${PROJECT_NAME}-backend/create_project" | |
37 | + @ curl "http://${LOCALHOST}/${PROJECT_NAME}-backend/$@" && echo "" | |
33 | 38 | endif |
34 | 39 | |
35 | 40 | config: |
36 | - @ $(info Using interface: ${NETWORK_INTERFACE}) | |
37 | - @ $(info Using local IP: ${LOCALHOST}) | |
38 | 41 | @ cp settings_local.py.tmpl settings_local.py |
39 | 42 | @ $(call SED_REPLACE_ALL_PATH,<path-to-project>,${PROJECT_DIR},settings_local.py) |
40 | 43 | @ $(call SED_REPLACE_ALL,localhost,${LOCALHOST},settings_local.py) |
... | ... | @@ -48,32 +51,36 @@ endif |
48 | 51 | @ $(call SED_REPLACE_ALL,user1,$$USER,./contrib/apache/${PROJECT_NAME}.conf) |
49 | 52 | @ $(call SED_REPLACE_ALL,group1,$$USER,./contrib/apache/${PROJECT_NAME}.conf) |
50 | 53 | @ $(call SED_REPLACE_ALL_PATH,<path-to-project>,${PROJECT_DIR},./contrib/apache/${PROJECT_NAME}.conf) |
51 | - @ sudo cp -u ${PYBOSSA_CONF} /etc/apache2/sites-available/${VLIBRAS_NAME}.conf | |
52 | - @ if grep -q "${PROJECT_NAME}" "/etc/apache2/sites-available/${VLIBRAS_NAME}.conf"; \ | |
54 | + @ sudo cp -u "/etc/apache2/sites-available/pybossa.conf" /etc/apache2/sites-available/wikilibras.conf | |
55 | + @ if grep -q "WSGIScriptAlias /${PROJECT_NAME}" "/etc/apache2/sites-available/wikilibras.conf"; \ | |
53 | 56 | then \ |
54 | - echo "A previous WSGI daemon definition for '${PROJECT_NAME}' in: /etc/apache2/sites-available/${VLIBRAS_NAME}.conf"; \ | |
57 | + echo "\33[33;1mA previous WSGI daemon definition for '${PROJECT_NAME}' in: /etc/apache2/sites-available/wikilibras.conf\33[0m"; \ | |
55 | 58 | else \ |
56 | - sudo sed -i -e "/Header/,/VirtualHost>/d" /etc/apache2/sites-available/${VLIBRAS_NAME}.conf; \ | |
59 | + sudo sed -i -e "/Header/,/VirtualHost>/d" /etc/apache2/sites-available/wikilibras.conf; \ | |
57 | 60 | sudo sed -n -e '/WSGIDaemonProcess/,/VirtualHost>/p' ./contrib/apache/${PROJECT_NAME}.conf | \ |
58 | - sudo tee -a /etc/apache2/sites-available/${VLIBRAS_NAME}.conf > /dev/null; \ | |
61 | + sudo tee -a /etc/apache2/sites-available/wikilibras.conf > /dev/null; \ | |
59 | 62 | fi |
63 | + | |
64 | +apache: | |
60 | 65 | @ sudo a2dissite pybossa.conf |
61 | - @ sudo a2ensite ${VLIBRAS_NAME}.conf | |
66 | + @ sudo a2ensite wikilibras.conf | |
62 | 67 | @ sudo apachectl configtest |
68 | + @ sudo service apache2 start | |
63 | 69 | @ sudo service apache2 reload |
64 | 70 | |
65 | 71 | clean: |
66 | 72 | @ find . -regextype posix-awk -regex "(.*.log|.*.pyc)" -type f -print -delete |
67 | 73 | |
68 | -uninstall: clean | |
74 | +uninstall: | |
69 | 75 | @ rm -rf ./env/ |
76 | + $(MAKE) clean | |
70 | 77 | @ rm -f ./settings_local.py |
71 | 78 | @ rm -f ./contrib/${PROJECT_NAME}.wsgi |
72 | - @ sudo rm -f /etc/apache2/sites-available/${VLIBRAS_NAME}.conf | |
73 | - @ sudo rm -f /etc/apache2/sites-enabled/${VLIBRAS_NAME}.conf | |
79 | + @ sudo rm -f /etc/apache2/sites-available/wikilibras.conf | |
80 | + @ sudo rm -f /etc/apache2/sites-enabled/wikilibras.conf | |
74 | 81 | |
75 | 82 | run: |
76 | 83 | @ ( \ |
77 | 84 | . ./env/bin/activate; \ |
78 | 85 | python main.py; \ |
79 | - ) | |
86 | + ) | ... | ... |