Download as
Browse Code »

Commit 91524c572aebfab1e8ece2e6720908a4d813eb52

Authored by André Araújo
1 parent 3910f074
Exists in master

Atualiza Makefile

Showing 1 changed file with 32 additions and 25 deletions   Show diff stats
1 -PROJECT_NAME = validador  
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 = validador
  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 ifndef LOCALHOST 9 ifndef LOCALHOST
9 ifndef NETWORK_INTERFACE 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 endif 12 endif
12 ifdef NETWORK_INTERFACE 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 endif 15 endif
15 endif 16 endif
16 17
17 ifndef LOCALHOST 18 ifndef LOCALHOST
18 - LOCALHOST := localhost 19 + LOCALHOST ?= 127.0.0.1
19 endif 20 endif
20 21
21 -install: uninstall config  
22 - @( \ 22 +install: uninstall config env
  23 +
  24 +env:
  25 + @ ( \
23 virtualenv ./env/; \ 26 virtualenv ./env/; \
24 . ./env/bin/activate; \ 27 . ./env/bin/activate; \
25 pip install -U pip; \ 28 pip install -U pip; \
@@ -27,14 +30,14 @@ install: uninstall config @@ -27,14 +30,14 @@ install: uninstall config
27 pip install -U ndg-httpsclient; \ 30 pip install -U ndg-httpsclient; \
28 pip install -r requirements.txt; \ 31 pip install -r requirements.txt; \
29 ) 32 )
  33 +
  34 +create_project update_project:
  35 + @ echo "http://${LOCALHOST}/${PROJECT_NAME}-backend/$@"
30 ifdef PYBOSSA_API_KEY 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 endif 38 endif
34 39
35 config: 40 config:
36 - @ $(info Using interface: ${NETWORK_INTERFACE})  
37 - @ $(info Using local IP: ${LOCALHOST})  
38 @ cp settings_local.py.tmpl settings_local.py 41 @ cp settings_local.py.tmpl settings_local.py
39 @ $(call SED_REPLACE_ALL_PATH,<path-to-project>,${PROJECT_DIR},settings_local.py) 42 @ $(call SED_REPLACE_ALL_PATH,<path-to-project>,${PROJECT_DIR},settings_local.py)
40 @ $(call SED_REPLACE_ALL,localhost,${LOCALHOST},settings_local.py) 43 @ $(call SED_REPLACE_ALL,localhost,${LOCALHOST},settings_local.py)
@@ -48,32 +51,36 @@ endif @@ -48,32 +51,36 @@ endif
48 @ $(call SED_REPLACE_ALL,user1,$$USER,./contrib/apache/${PROJECT_NAME}.conf) 51 @ $(call SED_REPLACE_ALL,user1,$$USER,./contrib/apache/${PROJECT_NAME}.conf)
49 @ $(call SED_REPLACE_ALL,group1,$$USER,./contrib/apache/${PROJECT_NAME}.conf) 52 @ $(call SED_REPLACE_ALL,group1,$$USER,./contrib/apache/${PROJECT_NAME}.conf)
50 @ $(call SED_REPLACE_ALL_PATH,<path-to-project>,${PROJECT_DIR},./contrib/apache/${PROJECT_NAME}.conf) 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 then \ 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 else \ 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 sudo sed -n -e '/WSGIDaemonProcess/,/VirtualHost>/p' ./contrib/apache/${PROJECT_NAME}.conf | \ 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 fi 62 fi
  63 +
  64 +apache:
60 @ sudo a2dissite pybossa.conf 65 @ sudo a2dissite pybossa.conf
61 - @ sudo a2ensite ${VLIBRAS_NAME}.conf 66 + @ sudo a2ensite wikilibras.conf
62 @ sudo apachectl configtest 67 @ sudo apachectl configtest
  68 + @ sudo service apache2 start
63 @ sudo service apache2 reload 69 @ sudo service apache2 reload
64 70
65 clean: 71 clean:
66 @ find . -regextype posix-awk -regex "(.*.log|.*.pyc)" -type f -print -delete 72 @ find . -regextype posix-awk -regex "(.*.log|.*.pyc)" -type f -print -delete
67 73
68 -uninstall: clean 74 +uninstall:
69 @ rm -rf ./env/ 75 @ rm -rf ./env/
  76 + $(MAKE) clean
70 @ rm -f ./settings_local.py 77 @ rm -f ./settings_local.py
71 @ rm -f ./contrib/${PROJECT_NAME}.wsgi 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 run: 82 run:
76 @ ( \ 83 @ ( \
77 . ./env/bin/activate; \ 84 . ./env/bin/activate; \
78 python main.py; \ 85 python main.py; \
79 - ) 86 + )