Ostico · aijanai · Jan 27, 2020 · Jan 27, 2020 · Jan 28, 2020 · Jan 28, 2020
diff --git a/.gitignore b/.gitignore
@@ -68,5 +68,4 @@ Session.vim
 .netrwhist
 *~
 .directory
-oauth_config.ini
-MateCat-Xenial/MateCatApache/data/etc/letsencrypt
+MateCat-Xenial/MateCatApache/data/etc/letsencrypt
diff --git a/MateCat-Bionic/AMQ/Dockerfile b/MateCat-Bionic/AMQ/Dockerfile
@@ -27,7 +27,11 @@ RUN chown -R activemq: /opt/apache-activemq-5.15.10/
 RUN ln -sf /opt/activemq/bin/activemq /etc/init.d/
 
 
-COPY installActivemq.sh /tmp/installActivemq.sh
-RUN chmod +x /tmp/installActivemq.sh
+RUN /etc/init.d/activemq create /etc/default/activemq
+RUN chown root:nogroup /etc/default/activemq
+RUN chmod 600 /etc/default/activemq
 
-CMD ["/tmp/installActivemq.sh"]
+RUN sed -i 's/managementContext createConnector="false"/managementContext createConnector="true"/g' /opt/activemq/conf/activemq.xml
+RUN ln -s /etc/init.d/activemq /usr/bin/activemq
+
+CMD ["activemq", "console"]
diff --git a/MateCat-Bionic/AMQ/installActivemq.sh b/MateCat-Bionic/AMQ/installActivemq.sh
diff --git a/MateCat-Bionic/Capistrano/Dockerfile b/MateCat-Bionic/Capistrano/Dockerfile
diff --git a/MateCat-Bionic/MateCatApache/Dockerfile b/MateCat-Bionic/MateCatApache/Dockerfile
@@ -1,22 +1,5 @@
 FROM ostico/bionic-base:latest
 
-RUN export DEBIAN_FRONTEND=noninteractive
-RUN ln -fs /usr/share/zoneinfo/Europe/Rome /etc/localtime
-
-RUN apt-get update
-RUN apt-get -y full-upgrade
-
-RUN locale-gen en_US.UTF-8
-ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
-RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/apache2
-RUN apt-get update
-
-RUN apt-get -y --fix-missing install apache2 apache2-dev libapache2-mod-php5.6 librdkafka1 librdkafka-dev \
-    php5.6 php5.6-json php5.6-curl php5.6-xdebug php5.6-mysql php5.6-xml php5.6-mbstring php5.6-dev php5.6-mcrypt php5.6-redis \
-    php5.6-zip mysql-client libzip-dev \
-    && echo "ServerName localhost" >> /etc/apache2/apache2.conf
-
 # Prepare the environment
 ENV PHP_POST_MAX_SIZE 1024M
 ENV PHP_UPLOAD_MAX_FILESIZE 1024M
@@ -26,22 +9,34 @@ ENV SERVICES_DIR "/etc/init.d"
 ENV USER_OWNER "www-data"
 ENV MATECAT_HOME "/var/www/matecat"
 
+ENV DEBIAN_FRONTEND=noninteractive
+ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
+
+RUN ln -fs /usr/share/zoneinfo/Europe/Rome /etc/localtime
+
+RUN apt-get update && apt-get -y full-upgrade
+
+RUN locale-gen en_US.UTF-8
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/apache2
+RUN apt-get update && apt-get -y --fix-missing install \
+    apache2 apache2-dev libapache2-mod-php5.6 \
+#librdkafka1 librdkafka-dev \
+    php5.6 php5.6-json php5.6-curl php5.6-xdebug php5.6-mysql php5.6-xml php5.6-mbstring php5.6-dev php5.6-mcrypt php5.6-redis php5.6-zip \
+    mysql-client libzip-dev unzip \
+    && echo "ServerName localhost" >> /etc/apache2/apache2.conf
+
 COPY ./app_configs/config.ini /tmp/config.ini
 COPY ./app_configs/node_config.ini /tmp/node_config.ini
 COPY ./app_configs/Error_Mail_List.ini /tmp/Error_Mail_List.ini
-
-# If you want to enable the login ssystem add your oauth_config.ini taken from Google
-#COPY ./app_configs/oauth_config.ini /tmp/oauth_config.ini
-
+COPY ./app_configs/oauth_config.ini /tmp/oauth_config.ini
 COPY ./app_configs/task_manager_config.ini /tmp/task_manager_config.ini
 
 # Apache
 RUN mkdir /var/log/apache2/matecat/
 RUN rm -rf /etc/apache2/sites-available/default
 RUN rm -rf /etc/apache2/sites-enabled/*
-RUN userdel www-data
-RUN groupadd www-data
-RUN useradd -ms /bin/bash -g www-data www-data
+RUN userdel www-data && groupadd www-data && useradd -ms /bin/bash -g www-data www-data
 
 RUN sed -i 's/session.save_handler\s*=\s*files/session.save_handler = redis/' /etc/php/5.6/apache2/php.ini
 RUN echo 'session.save_path = "tcp://redis:6379?database=15"' >> /etc/php/5.6/apache2/php.ini
@@ -66,18 +61,31 @@ RUN chmod +x /tmp/x_debug_setup.sh
 RUN /tmp/x_debug_setup.sh
 
 # Set rdkafka
-COPY rdkafka_setup.sh /tmp/rdkafka_setup.sh
-RUN chmod +x /tmp/rdkafka_setup.sh
-RUN /tmp/rdkafka_setup.sh
+#COPY rdkafka_setup.sh /tmp/rdkafka_setup.sh
+#RUN chmod +x /tmp/rdkafka_setup.sh
+#RUN /tmp/rdkafka_setup.sh
 
 # NodeJs
 COPY ./node-install.sh /tmp/node-install.sh
 RUN chmod +x /tmp/node-install.sh
 RUN /tmp/node-install.sh
 RUN rm /tmp/node-install.sh
 
-COPY run.sh /tmp/run.sh
-RUN chmod +x /tmp/run.sh
+COPY prepare.sh /tmp/prepare.sh
+RUN chmod +x /tmp/prepare.sh
+
+WORKDIR /var/www/matecat
+RUN git clone https://github.com/matecat/MateCat.git .
+
+RUN /tmp/prepare.sh
+
+COPY run-matecat.sh /run-matecat.sh
+RUN chmod +x /run-matecat.sh
+
+COPY run-fast-analysis.sh /run-fast-analysis.sh
+RUN chmod +x /run-fast-analysis.sh
+
+COPY run-tm-analysis.sh /run-tm-analysis.sh
+RUN chmod +x /run-tm-analysis.sh
 
-WORKDIR "/var/www/matecat"
-CMD ["/tmp/run.sh"]
+RUN chown -R ${USER_OWNER} ./lib ./public ./support_scripts ./index.php
diff --git a/MateCat-Bionic/MateCatApache/app_configs/config.ini b/MateCat-Bionic/MateCatApache/app_configs/config.ini
@@ -1,28 +1,36 @@
 ENV = "development"
-CHECK_FS = yes
+CHECK_FS = no
 BUILD_NUMBER = "X.X.X"
 
 [development]
-CLI_HTTP_HOST = "http://dev.matecat.com"
+CLI_HTTP_HOST = "https://dev.matecat.com"
+COOKIE_DOMAIN = "dev.matecat.com"
+ENABLE_MULTI_DOMAIN_API = no
+
 DB_SERVER = "mysql"
 DB_DATABASE = "matecat"
 DB_USER = "admin"
 DB_PASS = "admin"
+AJAX_DOMAINS            = 5
 MEMCACHE_SERVERS = ""
 REDIS_SERVERS = "tcp://redis:6379"
 QUEUE_BROKER_ADDRESS = "tcp://amq:61613"
 QUEUE_DQF_ADDRESS = "tcp://amq:61613"
 QUEUE_JMX_ADDRESS = "http://amq:8161"
+
+QUEUE_CREDENTIALS = "admin:admin"
 STORAGE_DIR = "/var/www/matecat/local_storage"
 CONVERSION_ENABLED = yes
 FORCE_XLIFF_CONVERSION = yes
 MAX_UPLOAD_FILE_SIZE = 104857600
 MAX_UPLOAD_TMX_FILE_SIZE = 104857600
+MYMEMORY_API_KEY = "pro@matecat.com"
+MYMEMORY_TM_API_KEY = "tmanalysis@matecat.com"
 
 ENABLE_OMEGAT_DOWNLOAD = true
-FILTERS_ADDRESS = "https://translated-matecat-filters-v1.p.mashape.com"
+FILTERS_ADDRESS = "http://filters:8732/"
 
-SSE_BASE_URL = "http://matecat/sse"
+SSE_BASE_URL = "dev.matecat.com/sse"
 SMTP_HOST = "10.30.1.225"
 SMTP_PORT = 2637
 SMTP_SENDER = "cattool@matecat.dock"

diff --git a/MateCat-Bionic/MateCatApache/app_configs/node_config.ini b/MateCat-Bionic/MateCatApache/app_configs/node_config.ini
@@ -1,4 +1,3 @@
-
 [server]
 address = localhost
 port = 7788

diff --git a/MateCat-Bionic/MateCatApache/app_configs/oauth_config.ini b/MateCat-Bionic/MateCatApache/app_configs/oauth_config.ini
@@ -0,0 +1,5 @@
+[OAUTH_CONFIG]
+OAUTH_CLIENT_ID       = #<YOUR_CLIENT_ID>
+OAUTH_CLIENT_SECRET   = #<YOUR_CLIENT_SECRET>
+OAUTH_CLIENT_APP_NAME = Matecat
+OAUTH_BROWSER_API_KEY = #<YOUR_BROWSER_API_KEY>
diff --git a/MateCat-Bionic/MateCatApache/app_configs/task_manager_config.ini b/MateCat-Bionic/MateCatApache/app_configs/task_manager_config.ini
@@ -35,6 +35,16 @@ P3[pid_set_name]  = "ch_pid_set_p3"
 P3[max_executors] = 5
 P3[redis_key]     = "p3_list"
 P3[loggerName]    = "tm_analysis_P3.log"
+
+;;##################################
+;;##### Key Name project_queue #####
+;;##################################
+PROJECT_QUEUE[queue_name]    = "project_queue"
+PROJECT_QUEUE[pid_set_name]  = "ch_pid_project_queue"
+PROJECT_QUEUE[max_executors] = 1
+PROJECT_QUEUE[redis_key]     = "project_queue_list"
+PROJECT_QUEUE[loggerName]    = "project_queue.log"
+
 ;;##############################
 ;;##### Key Name MailQueue #####
 ;;##############################
@@ -53,15 +63,6 @@ CONTRIBUTION[max_executors] = 1
 CONTRIBUTION[redis_key]     = "set_contribution_list"
 CONTRIBUTION[loggerName]    = "set_contribution.log"
 
-;;##############################
-;;##### Key Name Glossary  #####
-;;##############################
-GLOSSARY[queue_name]    = "glossary"
-GLOSSARY[pid_set_name]  = "ch_pid_glossary"
-GLOSSARY[max_executors] = 1
-GLOSSARY[redis_key]     = "glossary"
-GLOSSARY[loggerName]    = "glossary.log"
-
 ;;##############################
 ;;##### Key Name QAChecks  #####
 ;;##############################
@@ -71,27 +72,28 @@ QA_CHECKS[max_executors] = 1
 QA_CHECKS[redis_key] = "qa_checks_key"
 QA_CHECKS[loggerName] = "qa_checks.log"
 
-;;##############################
+;;#################################
 ;;##### Key Name activity_log #####
-;;##############################
+;;#################################
 ACTIVITYLOG[queue_name]    = "activity_log"
 ACTIVITYLOG[pid_set_name]  = "ch_pid_activity_log"
 ACTIVITYLOG[max_executors] = 1
 ACTIVITYLOG[redis_key]     = "activity_log_list"
 ACTIVITYLOG[loggerName]    = "activity_log.log"
 
-;;##################################
-;;##### Key Name project_queue #####
-;;##################################
-PROJECT_QUEUE[queue_name]    = "project_queue"
-PROJECT_QUEUE[pid_set_name]  = "ch_pid_project_queue"
-PROJECT_QUEUE[max_executors] = 1
-PROJECT_QUEUE[redis_key]     = "project_queue_list"
-PROJECT_QUEUE[loggerName]    = "project_queue.log"
-
 ;;##############################
-;;##### Key Name setContributionMT #####
+;;##### Key Name DQF       #####
 ;;##############################
+DQF[queue_name]    = "dqf"
+DQF[pid_set_name]  = "ch_pid_dqf"
+DQF[max_executors] = 1
+DQF[redis_key]     = "dqf_list"
+DQF[loggerName]    = "dqf.log"
+
+
+;;######################################
+;;##### Key Name setContributionMT #####
+;;######################################
 CONTRIBUTION_MT[queue_name]    = "set_contribution_mt"
 CONTRIBUTION_MT[pid_set_name]  = "ch_pid_set_contribution_mt"
 CONTRIBUTION_MT[max_executors] = 1
@@ -105,4 +107,59 @@ JOBS[queue_name]    = "jobs"
 JOBS[pid_set_name]  = "ch_pid_jobs"
 JOBS[max_executors] = 1
 JOBS[redis_key]     = "jobs_list"
-JOBS[loggerName]    = "jobs.log"
+JOBS[loggerName]    = "jobs.log"
+
+
+;;###############################
+;;##### Key Name tmx import #####
+;;###############################
+;ALIGNER_TMX_IMPORT[queue_name]   = "aligner_tmx_import"
+;ALIGNER_TMX_IMPORT[pid_set_name]  = "ch_pid_tmx_import"
+;ALIGNER_TMX_IMPORT[max_executors] = 1
+;ALIGNER_TMX_IMPORT[redis_key]     = "tmx_import_list"
+;ALIGNER_TMX_IMPORT[loggerName]    = "tmx_import.log"
+
+;;##############################
+;;##### Key Name setContribution #####
+;;##############################
+CONTRIBUTION_GET[queue_name]    = "get_contribution"
+CONTRIBUTION_GET[pid_set_name]  = "ch_pid_get_contribution"
+CONTRIBUTION_GET[max_executors] = 10
+CONTRIBUTION_GET[redis_key]     = "get_contribution_list"
+CONTRIBUTION_GET[loggerName]    = "get_contribution.log"
+
+;;###############################
+;;#####   Align Job Small   #####
+;;###############################
+ALIGNER_ALIGN_JOB_SMALL[queue_name]    = "aligner_align_job_small"
+ALIGNER_ALIGN_JOB_SMALL[pid_set_name]  = "ch_pid_align_job_small"
+ALIGNER_ALIGN_JOB_SMALL[max_executors] = 1
+ALIGNER_ALIGN_JOB_SMALL[redis_key]     = "align_job_small_list"
+ALIGNER_ALIGN_JOB_SMALL[loggerName]    = "align_job_small.log"
+
+;;###############################
+;;#####   Align Job Medium  #####
+;;###############################
+ALIGNER_ALIGN_JOB_MEDIUM[queue_name]    = "aligner_align_job_medium"
+ALIGNER_ALIGN_JOB_MEDIUM[pid_set_name]  = "ch_pid_align_job_medium"
+ALIGNER_ALIGN_JOB_MEDIUM[max_executors] = 1
+ALIGNER_ALIGN_JOB_MEDIUM[redis_key]     = "align_job_medium_list"
+ALIGNER_ALIGN_JOB_MEDIUM[loggerName]    = "align_job_medium.log"
+
+;;###############################
+;;#####    Align Job Big    #####
+;;###############################
+ALIGNER_ALIGN_JOB_BIG[queue_name]    = "aligner_align_job_big"
+ALIGNER_ALIGN_JOB_BIG[pid_set_name]  = "ch_pid_align_job_big"
+ALIGNER_ALIGN_JOB_BIG[max_executors] = 1
+ALIGNER_ALIGN_JOB_BIG[redis_key]     = "align_job_big_list"
+ALIGNER_ALIGN_JOB_BIG[loggerName]    = "align_job_big.log"
+
+;;###############################
+;;#####   Segment Create    #####
+;;###############################
+ALIGNER_SEGMENT_CREATE[queue_name]    = "aligner_segment_create"
+ALIGNER_SEGMENT_CREATE[pid_set_name]  = "ch_pid_aligner_segment_create"
+ALIGNER_SEGMENT_CREATE[max_executors] = 5
+ALIGNER_SEGMENT_CREATE[redis_key]     = "aligner_segment_create_list"
+ALIGNER_SEGMENT_CREATE[loggerName]    = "aligner_segment_create.log"