From e37286098e1b67728b74ed9bfe258a44f9686a95 Mon Sep 17 00:00:00 2001 From: jonathan.brilhante Date: Mon, 8 May 2017 22:47:19 -0300 Subject: [PATCH] Adicionando arquivos do wikilibras configurados para o container Docker --- Dockerfile | 146 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile.old | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ corretor_sinais | 1 + docker-compose.yml | 19 +++++++++++++++++++ docker-compose.yml.example | 19 +++++++++++++++++++ docker-compose.yml.template | 19 +++++++++++++++++++ pybossa | 1 + taskmgr | 1 + validador_sinais | 1 + wikilibras-api | 1 + wikilibras-core | 1 + wikilibras-front | 1 + wikilibras-pybossa.sql | 5 +++++ wikilibras-pybossa.sql.old | 47 +++++++++++++++++++++++++++++++++++++++++++++++ wikilibrasV2 | 1 + wikilibrasdbapi | 1 + 17 files changed, 504 insertions(+), 0 deletions(-) create mode 100755 Dockerfile create mode 100755 Makefile create mode 100755 Makefile.old create mode 160000 corretor_sinais create mode 100755 docker-compose.yml create mode 100755 docker-compose.yml.example create mode 100755 docker-compose.yml.template create mode 160000 pybossa create mode 160000 taskmgr create mode 160000 validador_sinais create mode 160000 wikilibras-api create mode 160000 wikilibras-core create mode 160000 wikilibras-front create mode 100755 wikilibras-pybossa.sql create mode 100755 wikilibras-pybossa.sql.old create mode 160000 wikilibrasV2 create mode 160000 wikilibrasdbapi diff --git a/Dockerfile b/Dockerfile new file mode 100755 index 0000000..dde662c --- /dev/null +++ b/Dockerfile @@ -0,0 +1,146 @@ +FROM ubuntu:14.04 + +MAINTAINER Jonathan Brilhante + +ENV PYTHONIOENCODING UTF-8 + +RUN sudo apt-get update + +RUN sudo apt-get install locales -y + +RUN sudo locale-gen pt_BR.UTF-8 + +RUN sudo update-locale LC_ALL=pt_BR.UTF-8 LANG=pt_BR.UTF-8 + +ENV LANG pt_BR.UTF-8 + +ENV LANGUAGE pt_BR:pt:en + +ENV LC_ALL pt_BR.UTF-8 + +ARG IP + +RUN echo $IP + +EXPOSE 18422:18422 + +EXPOSE 5432 + +EXPOSE 6379 + +EXPOSE 200:200 + +EXPOSE 201:201 + +EXPOSE 8003:8003 + +EXPOSE 27017 + +EXPOSE 80:80 + +RUN useradd vlibras + +#RUN useradd vlibras + +RUN apt-get update + +RUN apt-get install build-essential -y + +RUN apt-get install wget curl unzip -y + +RUN apt-get -y install nmap + +RUN apt-get -y install psmisc + +RUN apt-get update + +RUN apt-get install redis-server -y + +RUN apt-get install apache2 apache2-mpm-prefork apache2-utils -y + +RUN sudo apt-get build-dep libapache2-mod-wsgi -y + +RUN echo "vlibras ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers + +#RUN mkdir /etc/profile.d/ + +RUN mkdir /etc/profile.d/lavid/ + +RUN mkdir /etc/profile.d/lavid/vlibras + +RUN chown -R vlibras /etc/profile.d/ + +ENV USER="vlibras" + +RUN mkdir /home/vlibras/ + +RUN chown vlibras /home/vlibras/ + +RUN mkdir /home/vlibras/container + +WORKDIR /home/vlibras/container/ + +#RUN wget http://150.165.205.38:8000/vlibras-wikilibras-container.zip + +#RUN unzip vlibras-wikilibras-container.zip + +ADD . /home/vlibras/container/ + +RUN chown -R vlibras /home/vlibras/container/ + +USER vlibras + +WORKDIR /home/vlibras/container/ + +RUN make install KEY=2324bc23-7d6f-4840-8905-b1e6c1675eed + +WORKDIR /home/vlibras/container/pybossa/ + +RUN printf "2324bc23-7d6f-4840-8905-b1e6c1675eed" | make install KEY=2324bc23-7d6f-4840-8905-b1e6c1675eed + +RUN cd pybossa && ln -sf themes/default/translations + +WORKDIR /home/vlibras/container/corretor_sinais/ + +RUN make install + +WORKDIR /home/vlibras/container/validador_sinais/ + +RUN make install + +WORKDIR /home/vlibras/container/wikilibrasV2/ + +RUN make install + +WORKDIR /home/vlibras/container/wikilibras-front/ + +RUN make install + +WORKDIR /home/vlibras/container/wikilibras-api/ + +RUN make install + +WORKDIR /home/vlibras/container/wikilibrasdbapi/ + +RUN sudo apt-get install mongodb -y + +RUN make install + +RUN ( sudo service postgresql start & sleep 1m ) ; make create-db + +WORKDIR /home/vlibras/container/taskmgr/ + +RUN make install + +WORKDIR /home/vlibras/container/ + +RUN make config KEY=2324bc23-7d6f-4840-8905-b1e6c1675eed + +WORKDIR /home/vlibras/container/pybossa/ + +RUN ( sudo service postgresql start & sleep 1m ) ; sudo su postgres -c 'psql --set ON_ERROR_STOP=off -f /home/vlibras/container/pybossa/wikilibras-pybossa.sql pybossa' + +RUN sudo apt-get install nano git htop -y + +ENTRYPOINT ( sudo service postgresql start & sudo service mongodb start & sleep 1m ) ; ( make start-up & sleep 1m) ; ( cd /home/vlibras/container/ ; make create_project ) ; ( cd /home/vlibras/container/taskmgr/ ; make run) & (sleep 1m ; cd /home/vlibras/container/wikilibrasdbapi/ ; make run) & (cd /home/vlibras/container/wikilibras-api/ ; make run) +#ENTRYPOINT ( sudo service postgresql start & sudo service mongodb start & sleep 1m ) ; ( make start-up & sleep 1m) ; ( wget http://0.0.0.0/wikilibras-backend/create_project ; wget http://0.0.0.0/corretor-backend/create_project ; wget http://0.0.0.0/validador-backend/create_project ) ; ( cd /home/vlibras/container/taskmgr/ ; make run) & (sleep 1m ; cd /home/vlibras/container/wikilibrasdbapi/ ; make run) & (cd /home/vlibras/container/wikilibras-api/ ; make run) diff --git a/Makefile b/Makefile new file mode 100755 index 0000000..e47d72d --- /dev/null +++ b/Makefile @@ -0,0 +1,118 @@ +# 20170207 +# make config IP=127.0.0.1 KEY=XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX +# make install + +CURRENT_IP := $(shell ip route get 1 | awk '{print $$7; exit}') +NETWORK_INTERFACE := $(shell ip route | grep "default" | awk '{print $$5; exit}') +VLIBRAS_WIKILIBRAS_ENV := /etc/profile.d/lavid/vlibras/wikilibras_env.sh +VW_CORRETOR_DIR := $(CURDIR)/corretor_sinais +VW_DIR := $(CURDIR) +VW_LOCALHOST := ${IP} +VW_PYBOSSA_API_KEY := ${KEY} +VW_PYBOSSA_DIR := $(CURDIR)/pybossa +VW_TASKMGR_DIR := $(CURDIR)/taskmgr +VW_VALIDADOR_DIR := $(CURDIR)/validador_sinais +VW_WIKILIBRAS_DIR := $(CURDIR)/wikilibrasV2 +LOCALHOST = ${IP} + +-include ${VLIBRAS_WIKILIBRAS_ENV} + +ifndef VW_PYBOSSA_API_KEY + VW_PYBOSSA_API_KEY := ${PYBOSSA_API_KEY} +endif + +ifndef VW_LOCALHOST + # Attempt 1: use ip detected automatically + VW_LOCALHOST := ${CURRENT_IP} +endif + +ifndef VW_LOCALHOST + # Attempt 2: use ip stored in file ${VLIBRAS_WIKILIBRAS_ENV} + VW_LOCALHOST := ${LOCALHOST} +endif + +showip: + @ echo Current Interface: ${NETWORK_INTERFACE} + @ echo Current IP: ${CURRENT_IP} + +%_env.sh: + @ echo "#!/bin/sh" > "$@" + @ echo "" >> "$@" + @ echo "#***********************************************************************" >> "$@" + @ echo "# Environment variables for Wikilibras" >> "$@" + @ echo "#" >> "$@" + @ echo "# Created by: LAViD VLibras-Wikilibras $(shell date)" >> "$@" + @ echo "#" >> "$@" + @ echo "# WARNING! All changes made in this file will be lost after instalation!" >> "$@" + @ echo "#***********************************************************************" >> "$@" + @ echo "" >> "$@" + @ echo "export LOCALHOST=\"${VW_LOCALHOST}\"" >> "$@" + @ echo "export NETWORK_INTERFACE=\"${NETWORK_INTERFACE}\"" >> "$@" + @ echo "export PYBOSSA_API_KEY=\"${VW_PYBOSSA_API_KEY}\"" >> "$@" + @ echo "export VW_CORRETOR_DIR=\"${VW_CORRETOR_DIR}\"" >> "$@" + @ echo "export VW_DIR=\"${VW_DIR}\"" >> "$@" + @ echo "export VW_PYBOSSA_DIR=\"${VW_PYBOSSA_DIR}\"" >> "$@" + @ echo "export VW_TASKMGR_DIR=\"${VW_TASKMGR_DIR}\"" >> "$@" + @ echo "export VW_VALIDADOR_DIR=\"${VW_VALIDADOR_DIR}\"" >> "$@" + @ echo "export VW_WIKILIBRAS_DIR=\"${VW_WIKILIBRAS_DIR}\"" >> "$@" + +config: $(notdir ${VLIBRAS_WIKILIBRAS_ENV}) + @ cat "$^" + @ sudo install -m 655 -p "$^" -D "${VLIBRAS_WIKILIBRAS_ENV}" && rm -f "$^" + @ $(MAKE) -sC ${VW_PYBOSSA_DIR} $@ + @ $(MAKE) -sC ${VW_CORRETOR_DIR} $@ + @ $(MAKE) -sC ${VW_VALIDADOR_DIR} $@ + @ $(MAKE) -sC ${VW_WIKILIBRAS_DIR} $@ + @ $(MAKE) -sC ${VW_TASKMGR_DIR} $@ + @ $(MAKE) -s apache + @ $(MAKE) -s showip + +apache: + @ sudo service apache2 start + @ if [ -e /etc/apache2/sites-enabled/pybossa.conf ]; then sudo a2dissite pybossa.conf; fi + @ if [ -e /etc/apache2/sites-available/wikilibras.conf ]; then sudo a2ensite wikilibras.conf; fi + @ sudo apachectl configtest + @ sudo service apache2 reload + @ sudo service apache2 restart + +create_project update_project: + @ $(MAKE) -sC ${VW_CORRETOR_DIR} $@ + @ $(MAKE) -sC ${VW_VALIDADOR_DIR} $@ + @ $(MAKE) -sC ${VW_WIKILIBRAS_DIR} $@ + +REPOSITORIES += "corretor_sinais" +REPOSITORIES += "pybossa" +REPOSITORIES += "taskmgr" +REPOSITORIES += "validador_sinais" +REPOSITORIES += "wikilibras-api" +REPOSITORIES += "wikilibras-core" +REPOSITORIES += "wikilibras-front" +REPOSITORIES += "wikilibrasdbapi" +REPOSITORIES += "wikilibrasV2" + +reset: + @ curl "http://${LOCALHOST}:200/reset" && echo "" + @ curl "http://${LOCALHOST}:200/resettasks" && echo "" + @ $(MAKE) -sC wikilibrasdbapi distclean + @ $(MAKE) -sC taskmgr clean + @ $(MAKE) -sC wikilibras-core clean + @ sudo service apache2 stop + @ sudo rm -f /var/log/apache2/error.log + @ sudo touch /var/log/apache2/error.log + @ sudo service apache2 start + @ sudo service apache2 reload + @ $(MAKE) -sC $(CURDIR) update_project + +clone: + @ for i in ${REPOSITORIES}; \ + do \ + [ -d "$$i" ] || git clone "git@gitlab.lavid.ufpb.br:wikilibras/$$i.git"; \ + done + +install: + @ sudo apt-get update && sudo apt-get -y install build-essential git-core openssh-server + +uninstall: + @ sudo rm -f ${VLIBRAS_WIKILIBRAS_ENV} + +.PHONY: %_env.sh config clone showip install uninstall diff --git a/Makefile.old b/Makefile.old new file mode 100755 index 0000000..778a883 --- /dev/null +++ b/Makefile.old @@ -0,0 +1,122 @@ +# 20170207 +# make config IP=127.0.0.1 KEY=XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX +# make install + +CURRENT_IP := $(shell ip route get 1 | awk '{print $$7; exit}') +NETWORK_INTERFACE := $(shell ip route | grep "default" | awk '{print $$5; exit}') +VLIBRAS_WIKILIBRAS_ENV := /etc/profile.d/lavid/vlibras/wikilibras_env.sh +VW_CORRETOR_DIR := $(CURDIR)/corretor_sinais +VW_DIR := $(CURDIR) +VW_LOCALHOST := ${IP} +VW_PYBOSSA_API_KEY := ${KEY} +VW_PYBOSSA_DIR := $(CURDIR)/pybossa +VW_TASKMGR_DIR := $(CURDIR)/taskmgr +VW_VALIDADOR_DIR := $(CURDIR)/validador_sinais +VW_WIKILIBRAS_DIR := $(CURDIR)/wikilibrasV2 + +-include ${VLIBRAS_WIKILIBRAS_ENV} + +ifndef VW_PYBOSSA_API_KEY + VW_PYBOSSA_API_KEY := ${PYBOSSA_API_KEY} +endif + +ifndef VW_LOCALHOST + # Attempt 1: use ip detected automatically + VW_LOCALHOST := ${CURRENT_IP} +endif + +ifndef VW_LOCALHOST + # Attempt 2: use ip stored in file ${VLIBRAS_WIKILIBRAS_ENV} + VW_LOCALHOST := ${LOCALHOST} +endif + +ifndef VW_LOCALHOST + # Attempt 3: use loopback if the current ip was not detect + VW_LOCALHOST := 127.0.0.1 +endif + +showip: + @ echo Current Interface: ${NETWORK_INTERFACE} + @ echo Current IP: ${CURRENT_IP} + +%_env.sh: + @ echo "#!/bin/sh" > "$@" + @ echo "" >> "$@" + @ echo "#***********************************************************************" >> "$@" + @ echo "# Environment variables for Wikilibras" >> "$@" + @ echo "#" >> "$@" + @ echo "# Created by: LAViD VLibras-Wikilibras $(shell date)" >> "$@" + @ echo "#" >> "$@" + @ echo "# WARNING! All changes made in this file will be lost after instalation!" >> "$@" + @ echo "#***********************************************************************" >> "$@" + @ echo "" >> "$@" + @ echo "export LOCALHOST=\"${VW_LOCALHOST}\"" >> "$@" + @ echo "export NETWORK_INTERFACE=\"${NETWORK_INTERFACE}\"" >> "$@" + @ echo "export PYBOSSA_API_KEY=\"${VW_PYBOSSA_API_KEY}\"" >> "$@" + @ echo "export VW_CORRETOR_DIR=\"${VW_CORRETOR_DIR}\"" >> "$@" + @ echo "export VW_DIR=\"${VW_DIR}\"" >> "$@" + @ echo "export VW_PYBOSSA_DIR=\"${VW_PYBOSSA_DIR}\"" >> "$@" + @ echo "export VW_TASKMGR_DIR=\"${VW_TASKMGR_DIR}\"" >> "$@" + @ echo "export VW_VALIDADOR_DIR=\"${VW_VALIDADOR_DIR}\"" >> "$@" + @ echo "export VW_WIKILIBRAS_DIR=\"${VW_WIKILIBRAS_DIR}\"" >> "$@" + +config: $(notdir ${VLIBRAS_WIKILIBRAS_ENV}) + @ cat "$^" + @ sudo install -m 655 -p "$^" -D "${VLIBRAS_WIKILIBRAS_ENV}" && rm -f "$^" + @ $(MAKE) -sC ${VW_PYBOSSA_DIR} $@ + @ $(MAKE) -sC ${VW_CORRETOR_DIR} $@ + @ $(MAKE) -sC ${VW_VALIDADOR_DIR} $@ + @ $(MAKE) -sC ${VW_WIKILIBRAS_DIR} $@ + @ $(MAKE) -sC ${VW_TASKMGR_DIR} $@ + @ $(MAKE) -s apache + @ $(MAKE) -s showip + +apache: + @ sudo service apache2 start + @ if [ -e /etc/apache2/sites-enabled/pybossa.conf ]; then sudo a2dissite pybossa.conf; fi + @ if [ -e /etc/apache2/sites-available/wikilibras.conf ]; then sudo a2ensite wikilibras.conf; fi + @ sudo apachectl configtest + @ sudo service apache2 reload + @ sudo service apache2 restart + +create_project update_project: + @ $(MAKE) -sC ${VW_CORRETOR_DIR} $@ + @ $(MAKE) -sC ${VW_VALIDADOR_DIR} $@ + @ $(MAKE) -sC ${VW_WIKILIBRAS_DIR} $@ + +REPOSITORIES += "corretor_sinais" +REPOSITORIES += "pybossa" +REPOSITORIES += "taskmgr" +REPOSITORIES += "validador_sinais" +REPOSITORIES += "wikilibras-api" +REPOSITORIES += "wikilibras-core" +REPOSITORIES += "wikilibras-front" +REPOSITORIES += "wikilibrasdbapi" +REPOSITORIES += "wikilibrasV2" + +reset: + @ curl "http://${LOCALHOST}:200/reset" && echo "" + @ curl "http://${LOCALHOST}:200/resettasks" && echo "" + @ $(MAKE) -sC wikilibrasdbapi distclean + @ $(MAKE) -sC taskmgr clean + @ $(MAKE) -sC wikilibras-core clean + @ sudo service apache2 stop + @ sudo rm -f /var/log/apache2/error.log + @ sudo touch /var/log/apache2/error.log + @ sudo service apache2 start + @ sudo service apache2 reload + @ $(MAKE) -sC $(CURDIR) update_project + +clone: + @ for i in ${REPOSITORIES}; \ + do \ + [ -d "$$i" ] || git clone "git@gitlab.lavid.ufpb.br:wikilibras/$$i.git"; \ + done + +install: + @ sudo apt-get update && sudo apt-get -y install build-essential git-core openssh-server + +uninstall: + @ sudo rm -f ${VLIBRAS_WIKILIBRAS_ENV} + +.PHONY: %_env.sh config clone showip install uninstall diff --git a/corretor_sinais b/corretor_sinais new file mode 160000 index 0000000..17bfe67 --- /dev/null +++ b/corretor_sinais @@ -0,0 +1 @@ +Subproject commit 17bfe675dbd534c326f5b3b27c94aaa8e71f93bf diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100755 index 0000000..e686788 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,19 @@ +version: '2' + +services: + web: + build: + context: . + args: + - IP=150.165.205.99 + ports: + - "80:80" + - "18422" + - "5432" + - "6379" + - "27017" + - "200:200" + - "201:201" + - "8003" + stdin_open: true + tty: true diff --git a/docker-compose.yml.example b/docker-compose.yml.example new file mode 100755 index 0000000..e686788 --- /dev/null +++ b/docker-compose.yml.example @@ -0,0 +1,19 @@ +version: '2' + +services: + web: + build: + context: . + args: + - IP=150.165.205.99 + ports: + - "80:80" + - "18422" + - "5432" + - "6379" + - "27017" + - "200:200" + - "201:201" + - "8003" + stdin_open: true + tty: true diff --git a/docker-compose.yml.template b/docker-compose.yml.template new file mode 100755 index 0000000..3a6ced8 --- /dev/null +++ b/docker-compose.yml.template @@ -0,0 +1,19 @@ +version: '2' + +services: + web: + build: + context: . + args: + - IP= + ports: + - "80:80" + - "18422" + - "5432" + - "6379" + - "27017" + - "200:200" + - "201:201" + - "8003" + stdin_open: true + tty: true diff --git a/pybossa b/pybossa new file mode 160000 index 0000000..021d32f --- /dev/null +++ b/pybossa @@ -0,0 +1 @@ +Subproject commit 021d32f0835024fe8308ff1e7a140f0d8924ebae diff --git a/taskmgr b/taskmgr new file mode 160000 index 0000000..db29792 --- /dev/null +++ b/taskmgr @@ -0,0 +1 @@ +Subproject commit db297928a80a883cfe99a194d8c5ce0cb1320967 diff --git a/validador_sinais b/validador_sinais new file mode 160000 index 0000000..b310f70 --- /dev/null +++ b/validador_sinais @@ -0,0 +1 @@ +Subproject commit b310f70c8300f271fd5e76f4ac5cb1704e85c63e diff --git a/wikilibras-api b/wikilibras-api new file mode 160000 index 0000000..7b3137a --- /dev/null +++ b/wikilibras-api @@ -0,0 +1 @@ +Subproject commit 7b3137a24be9c8fc4230dc5c95b1888331f31641 diff --git a/wikilibras-core b/wikilibras-core new file mode 160000 index 0000000..5b7d5ca --- /dev/null +++ b/wikilibras-core @@ -0,0 +1 @@ +Subproject commit 5b7d5ca9c099fc4ebadee5efd2a8d7d66bdc714b diff --git a/wikilibras-front b/wikilibras-front new file mode 160000 index 0000000..cfed5df --- /dev/null +++ b/wikilibras-front @@ -0,0 +1 @@ +Subproject commit cfed5df11564218b9c2f37f250141f8699ca5700 diff --git a/wikilibras-pybossa.sql b/wikilibras-pybossa.sql new file mode 100755 index 0000000..fabfd41 --- /dev/null +++ b/wikilibras-pybossa.sql @@ -0,0 +1,5 @@ +-- how to install: +-- sudo su postgres -c "psql --set ON_ERROR_STOP=off -f wikilibras-pybossa.sql pybossa" + +INSERT INTO "user" VALUES (1, '2017-01-01T00:00:00.000000', 'wikilibras@lavid.ufpb.br', 'wikilibras', 'wikilibras', 'pt_BR', '2324bc23-7d6f-4840-8905-b1e6c1675eed', 'pbkdf2:sha1:1000$wIP6vkOx$99be5c325961aa39030bb10e3b58a85ac3bfaa90', true, false, false, NULL, NULL, NULL, NULL, NULL, NULL, false, true, false, true, '{}', 1); +SELECT pg_catalog.setval('user_id_seq', 1, true); diff --git a/wikilibras-pybossa.sql.old b/wikilibras-pybossa.sql.old new file mode 100755 index 0000000..4102e5f --- /dev/null +++ b/wikilibras-pybossa.sql.old @@ -0,0 +1,47 @@ +-- install: +-- sudo su postgres -c 'psql --set ON_ERROR_STOP=off -f wikilibras-pybossa.sql pybossa' + +-- SELECT * FROM "user"; +-- postgres://pybossa:tester@localhost:5432/pybossa + +INSERT INTO "user" ( + id, + created, + email_addr, + name, + fullname, + locale, + api_key, + passwd_hash, + admin, + pro, + privacy_mode, + google_user_id, + ckan_api, + newsletter_prompted, + valid_email, + confirmation_email_sent, + subscribed, + info, + profile_id +) VALUES ( + 1, --id + '2017-02-20T15:12:14.560847', --created + 'wikilibras@lavid.ufpb.br', --email_addr + 'wikilibras', --name + 'wikilibras', --fullname + 'pt_BR', --locale + '2324bc23-7d6f-4840-8905-b1e6c1675eed', --api_key + 'pbkdf2:sha1:1000$wIP6vkOx$99be5c325961aa39030bb10e3b58a85ac3bfaa90', --passwd_hash, + 't', --admin + 'f', --pro + 'f', --privacy_mode + '', --google_user_id + '', --ckan_api + 'f', --newsletter_prompted + 't', --valid_email + 'f', --confirmation_email_sent + 't', --subscribed + '{}', --info + 1 --profile_i +) diff --git a/wikilibrasV2 b/wikilibrasV2 new file mode 160000 index 0000000..7320576 --- /dev/null +++ b/wikilibrasV2 @@ -0,0 +1 @@ +Subproject commit 73205767116b388b8eedf9acd02331b170af2fe6 diff --git a/wikilibrasdbapi b/wikilibrasdbapi new file mode 160000 index 0000000..c66b024 --- /dev/null +++ b/wikilibrasdbapi @@ -0,0 +1 @@ +Subproject commit c66b0247a383ef8e2106c7b838c7c086837dfd83 -- libgit2 0.21.2