From bb98a41d5a00e7b20e3e325874cb6a44ffbdad8f Mon Sep 17 00:00:00 2001 From: Guilherme Andrade Del Cantoni Date: Thu, 8 Dec 2016 17:00:35 -0200 Subject: [PATCH] Parametrização do endereço de externo do SEI via variáveis de ambiente --- httpd/Dockerfile | 8 ++++---- httpd/assets/ConfiguracaoSEI.php | 2 +- httpd/assets/ConfiguracaoSip.php | 2 +- httpd/assets/oracle/install_oracle.sh | 22 ++++++++++++++++++++++ httpd/assets/oracle/oracle-instantclient11.2-basic-11.2.0.4.0-1.x86_64.rpm | Bin 0 -> 59865008 bytes httpd/assets/oracle/oracle-instantclient11.2-devel-11.2.0.4.0-1.x86_64.rpm | Bin 0 -> 610222 bytes httpd/assets/oracle/oracle-instantclient11.2-sqlplus-11.2.0.4.0-1.x86_64.rpm | Bin 0 -> 828333 bytes httpd/entrypoint.sh | 14 +++++++++++--- httpd/install.sh | 4 ++-- httpd/oracle/install_oracle.sh | 22 ---------------------- httpd/oracle/oracle-instantclient11.2-basic-11.2.0.4.0-1.x86_64.rpm | Bin 59865008 -> 0 bytes httpd/oracle/oracle-instantclient11.2-devel-11.2.0.4.0-1.x86_64.rpm | Bin 610222 -> 0 bytes httpd/oracle/oracle-instantclient11.2-sqlplus-11.2.0.4.0-1.x86_64.rpm | Bin 828333 -> 0 bytes 13 files changed, 41 insertions(+), 33 deletions(-) create mode 100644 httpd/assets/oracle/install_oracle.sh create mode 100644 httpd/assets/oracle/oracle-instantclient11.2-basic-11.2.0.4.0-1.x86_64.rpm create mode 100644 httpd/assets/oracle/oracle-instantclient11.2-devel-11.2.0.4.0-1.x86_64.rpm create mode 100644 httpd/assets/oracle/oracle-instantclient11.2-sqlplus-11.2.0.4.0-1.x86_64.rpm delete mode 100644 httpd/oracle/install_oracle.sh delete mode 100644 httpd/oracle/oracle-instantclient11.2-basic-11.2.0.4.0-1.x86_64.rpm delete mode 100644 httpd/oracle/oracle-instantclient11.2-devel-11.2.0.4.0-1.x86_64.rpm delete mode 100644 httpd/oracle/oracle-instantclient11.2-sqlplus-11.2.0.4.0-1.x86_64.rpm diff --git a/httpd/Dockerfile b/httpd/Dockerfile index a015ff7..af3f0ae 100644 --- a/httpd/Dockerfile +++ b/httpd/Dockerfile @@ -13,10 +13,10 @@ ENV TERM xterm # Arquivos de instalação de componentes do SEI COPY assets/msttcore-fonts-2.0-3.noarch.rpm /tmp -COPY oracle/oracle-instantclient11.2-basic-11.2.0.4.0-1.x86_64.rpm /tmp/ -COPY oracle/oracle-instantclient11.2-devel-11.2.0.4.0-1.x86_64.rpm /tmp/ -COPY oracle/oracle-instantclient11.2-sqlplus-11.2.0.4.0-1.x86_64.rpm /tmp/ -COPY oracle/install_oracle.sh /tmp/ +COPY assets/oracle/oracle-instantclient11.2-basic-11.2.0.4.0-1.x86_64.rpm /tmp/ +COPY assets/oracle/oracle-instantclient11.2-devel-11.2.0.4.0-1.x86_64.rpm /tmp/ +COPY assets/oracle/oracle-instantclient11.2-sqlplus-11.2.0.4.0-1.x86_64.rpm /tmp/ +COPY assets/oracle/install_oracle.sh /tmp/ # Instalação do SEI e demais componentes acessórios COPY install.sh /install.sh diff --git a/httpd/assets/ConfiguracaoSEI.php b/httpd/assets/ConfiguracaoSEI.php index c682d56..89b6455 100644 --- a/httpd/assets/ConfiguracaoSEI.php +++ b/httpd/assets/ConfiguracaoSEI.php @@ -27,7 +27,7 @@ class ConfiguracaoSEI extends InfraConfiguracao { 'SessaoSEI' => array( 'SiglaOrgaoSistema' => 'ABC', 'SiglaSistema' => 'SEI', - 'PaginaLogin' => 'http://localhost/sip/login.php', + 'PaginaLogin' => getenv('SEI_HOST_URL').'/sip/login.php', 'SipWsdl' => 'http://localhost/sip/controlador_ws.php?servico=wsdl', 'https' => false), diff --git a/httpd/assets/ConfiguracaoSip.php b/httpd/assets/ConfiguracaoSip.php index f9fc760..6448eca 100644 --- a/httpd/assets/ConfiguracaoSip.php +++ b/httpd/assets/ConfiguracaoSip.php @@ -22,7 +22,7 @@ class ConfiguracaoSip extends InfraConfiguracao { 'SessaoSip' => array( 'SiglaOrgaoSistema' => 'ABC', 'SiglaSistema' => 'SIP', - 'PaginaLogin' => 'http://localhost/sip/login.php', + 'PaginaLogin' => getenv('SEI_HOST_URL').'/sip/login.php', 'SipWsdl' => 'http://localhost/sip/controlador_ws.php?servico=wsdl', 'https' => false), diff --git a/httpd/assets/oracle/install_oracle.sh b/httpd/assets/oracle/install_oracle.sh new file mode 100644 index 0000000..f6f5038 --- /dev/null +++ b/httpd/assets/oracle/install_oracle.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +set -e + +# Instala?o de depend?cias do projeto +yum -y install libaio + +# Instala?o dos pacotes Basic e SDK Instant Client +rpm -Uvh /tmp/oracle-instantclient11.2-basic-11.2.0.4.0-1.x86_64.rpm +rpm -Uvh /tmp/oracle-instantclient11.2-devel-11.2.0.4.0-1.x86_64.rpm +rpm -Uvh /tmp/oracle-instantclient11.2-sqlplus-11.2.0.4.0-1.x86_64.rpm + +# Instala?o dos OCI8 extension +printf "\n" | pecl install oci8-2.0.12 + +# Habilita?o da extens? do Oracle +echo "extension=oci8.so" > /etc/php.d/oci8.ini + +# Configura?o de diret?io do Oracle Instant Client no dynamic linker/loader +echo "/usr/lib/oracle/11.2/client64/lib" > /etc/ld.so.conf.d/oracle-11.conf + +exit 0 diff --git a/httpd/assets/oracle/oracle-instantclient11.2-basic-11.2.0.4.0-1.x86_64.rpm b/httpd/assets/oracle/oracle-instantclient11.2-basic-11.2.0.4.0-1.x86_64.rpm new file mode 100644 index 0000000..032ef0d Binary files /dev/null and b/httpd/assets/oracle/oracle-instantclient11.2-basic-11.2.0.4.0-1.x86_64.rpm differ diff --git a/httpd/assets/oracle/oracle-instantclient11.2-devel-11.2.0.4.0-1.x86_64.rpm b/httpd/assets/oracle/oracle-instantclient11.2-devel-11.2.0.4.0-1.x86_64.rpm new file mode 100644 index 0000000..30aaa0b Binary files /dev/null and b/httpd/assets/oracle/oracle-instantclient11.2-devel-11.2.0.4.0-1.x86_64.rpm differ diff --git a/httpd/assets/oracle/oracle-instantclient11.2-sqlplus-11.2.0.4.0-1.x86_64.rpm b/httpd/assets/oracle/oracle-instantclient11.2-sqlplus-11.2.0.4.0-1.x86_64.rpm new file mode 100644 index 0000000..5127722 Binary files /dev/null and b/httpd/assets/oracle/oracle-instantclient11.2-sqlplus-11.2.0.4.0-1.x86_64.rpm differ diff --git a/httpd/entrypoint.sh b/httpd/entrypoint.sh index c00c69d..b8bf031 100644 --- a/httpd/entrypoint.sh +++ b/httpd/entrypoint.sh @@ -21,10 +21,9 @@ fi # Ajustes de permissões diversos para desenvolvimento do SEI chmod +x /opt/sei/bin/wkhtmltopdf-amd64 chmod +x /opt/sei/bin/pdfboxmerge.jar -chown -R 777 /opt +chmod -R 777 /opt/sei/temp +chmod -R 777 /opt/sip/temp chmod -R 777 /var/sei/arquivos -#chmod -R 777 /opt/sei/temp -#chmod -R 777 /opt/sip/temp # Inicialização das rotinas de agendamento /etc/init.d/rsyslog start @@ -34,5 +33,14 @@ chmod -R 777 /var/sei/arquivos /etc/init.d/gearmand start /etc/init.d/supervisord start +# Atualização do endereço de host da aplicação +echo "Slepping..." && sleep 10 +SEI_HOST_URL=${SEI_HOST_URL:-"http://localhost"} +SEI_DATABASE_USER=${SEI_DATABASE_USER:-"root"} +SEI_DATABASE_PASSWORD=${SEI_DATABASE_PASSWORD:-"root"} +MYSQL_CMD="mysql --host mysql --user $SEI_DATABASE_USER --password=$SEI_DATABASE_PASSWORD" +$MYSQL_CMD -e "update sistema set pagina_inicial='$SEI_HOST_URL/sip' where sigla='SIP';" sip +$MYSQL_CMD -e "update sistema set pagina_inicial='$SEI_HOST_URL/sei/inicializar.php' where sigla='SEI';" sip + # Inicialização do servidor web /usr/sbin/httpd -DFOREGROUND diff --git a/httpd/install.sh b/httpd/install.sh index a3fa21d..001a1fb 100644 --- a/httpd/install.sh +++ b/httpd/install.sh @@ -4,7 +4,7 @@ set -e # Instalação dos componentes básicos do servidor web apache yum -y update -yum -y install httpd24u mysql56u memcached openssl wget curl unzip gcc java-1.8.0-openjdk libxml2 crontabs +yum -y install httpd24u mysql56u memcached openssl wget curl unzip gcc java-1.8.0-openjdk libxml2 crontabs mysql # Instalação do PHP e demais extenções necessárias para o projeto wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm @@ -38,7 +38,7 @@ bash /tmp/install_oracle.sh yum -y install freetds freetds-devel php56u-mssql # Instalação de componentes para teste do Barramento de Seriços do PEN -yum -y install supervisor gearmand libgearman libgearman-devel php56u-pecl-gearman +yum -y install --exclude=mysql-libs --exclude=mysqlclient16 supervisor gearmand libgearman libgearman-devel php56u-pecl-gearman # Configuração de permissão do diretório de arquivos mkdir -p /var/sei/arquivos diff --git a/httpd/oracle/install_oracle.sh b/httpd/oracle/install_oracle.sh deleted file mode 100644 index f6f5038..0000000 --- a/httpd/oracle/install_oracle.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - -set -e - -# Instala?o de depend?cias do projeto -yum -y install libaio - -# Instala?o dos pacotes Basic e SDK Instant Client -rpm -Uvh /tmp/oracle-instantclient11.2-basic-11.2.0.4.0-1.x86_64.rpm -rpm -Uvh /tmp/oracle-instantclient11.2-devel-11.2.0.4.0-1.x86_64.rpm -rpm -Uvh /tmp/oracle-instantclient11.2-sqlplus-11.2.0.4.0-1.x86_64.rpm - -# Instala?o dos OCI8 extension -printf "\n" | pecl install oci8-2.0.12 - -# Habilita?o da extens? do Oracle -echo "extension=oci8.so" > /etc/php.d/oci8.ini - -# Configura?o de diret?io do Oracle Instant Client no dynamic linker/loader -echo "/usr/lib/oracle/11.2/client64/lib" > /etc/ld.so.conf.d/oracle-11.conf - -exit 0 diff --git a/httpd/oracle/oracle-instantclient11.2-basic-11.2.0.4.0-1.x86_64.rpm b/httpd/oracle/oracle-instantclient11.2-basic-11.2.0.4.0-1.x86_64.rpm deleted file mode 100644 index 032ef0d..0000000 Binary files a/httpd/oracle/oracle-instantclient11.2-basic-11.2.0.4.0-1.x86_64.rpm and /dev/null differ diff --git a/httpd/oracle/oracle-instantclient11.2-devel-11.2.0.4.0-1.x86_64.rpm b/httpd/oracle/oracle-instantclient11.2-devel-11.2.0.4.0-1.x86_64.rpm deleted file mode 100644 index 30aaa0b..0000000 Binary files a/httpd/oracle/oracle-instantclient11.2-devel-11.2.0.4.0-1.x86_64.rpm and /dev/null differ diff --git a/httpd/oracle/oracle-instantclient11.2-sqlplus-11.2.0.4.0-1.x86_64.rpm b/httpd/oracle/oracle-instantclient11.2-sqlplus-11.2.0.4.0-1.x86_64.rpm deleted file mode 100644 index 5127722..0000000 Binary files a/httpd/oracle/oracle-instantclient11.2-sqlplus-11.2.0.4.0-1.x86_64.rpm and /dev/null differ -- libgit2 0.21.2