avmtrf1-tools 0.38.1 → 0.38.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c87f809a9926218291f4b57af7047d55ca4c612d1dcc034d01775f83d32af80
-  data.tar.gz: 3484e235b30f179892ad90db5ad2e82da61c457059cf3945004ce7a56cca62c2
+  metadata.gz: 037a6ec540a874c12392621c8b3f464d5361d98249b1e9119e8332b061de26ab
+  data.tar.gz: b620adfa7a3c73c3624f3333baf0964d4953c8be195d9b7e92a06c6ff0c1c0a9
 SHA512:
-  metadata.gz: 1eac41804ec158176af21b06ca3ae8e09941b7e402059eb94038bac2a14f235d8a574b23a01366c82767c6fb1d099022917bc8fcbb51ad4b8db0b9eb88763266
-  data.tar.gz: 5b14500f85e8b0c8c026b28b37fcd9fc3ba9c3f8e1764a15f69f493134bb8ee1654026fb46b293fccb380bab3c448d5a457af58550d68044c3fc69ef1ad26557
+  metadata.gz: 3aa77327c882bf6f591e7cdfed791e226bca9789207ae8bb24040a9d5a959723349f933d1759e02bee96853a900ee282cd0b7199d2ac2c57e732b21a17a4e07b
+  data.tar.gz: e4574401f796466b176217b928b6e346f3d19119ba57c03bd98c5c78513c31e4ec58b52ef409202255c82adee9d98e7ca6dad4a2df017cbd07c0c30e3fbf7f3d

data/lib/avmtrf1/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avmtrf1
   module Tools
-    VERSION = '0.38.1'
+    VERSION = '0.38.2'
   end
 end

data/template/avmtrf1/php/docker_image/Dockerfile.template

@@ -39,6 +39,9 @@ RUN docker-php-ext-install ldap
 RUN apt-get install -y libmcrypt-dev
 %%MCRYPT_INSTALL%%
 
+# Extensão PHP "pcntl"
+RUN docker-php-ext-install pcntl
+
 # Extensão PHP "snmp"
 RUN apt-get install -y libsnmp-dev snmp
 RUN docker-php-ext-install snmp

data/template/avmtrf1/php/docker_image/aux/apache_user.sh

@@ -12,23 +12,43 @@ done
 DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
 source "$DIR/init.sh"
 
-if user_exist_by_id "$APP_USER_ID"; then
-  infom "ID de usuário \"$APP_USER_ID\" já existe"
-elif user_exist_by_name "$APACHE_USER_NAME"; then
-  infom "Alterando ID do usuário \"$APACHE_USER_NAME\"..."
-  usermod --uid "$APP_USER_ID" "$APACHE_USER_NAME"
-else
-  infom "Criando usuário \"$APACHE_USER_NAME\"..."
-  useradd --uid "$APP_USER_ID" "$APACHE_USER_NAME"
-fi
+function apache_user_home() {
+  getent passwd "$APP_USER_ID" | cut '-d:' '-f6'
+}
 
-if [[ "$APP_USER_ID" == '0' ]]; then
-  infom "\$APP_USER_ID é 0 (root). Apache executará com usuário padrão (Nenhuma alteração)"
-else
+function assert_apache_user() {
+  if user_exist_by_id "$APP_USER_ID"; then
+    infom "ID de usuário \"$APP_USER_ID\" já existe"
+  elif user_exist_by_name "$APACHE_USER_NAME"; then
+    infom "Alterando ID do usuário \"$APACHE_USER_NAME\"..."
+    usermod --uid "$APP_USER_ID" "$APACHE_USER_NAME"
+  else
+    infom "Criando usuário \"$APACHE_USER_NAME\"..."
+    useradd --uid "$APP_USER_ID" "$APACHE_USER_NAME"
+  fi
+}
+
+
+function assert_apache_user_home() {
+  infom 'Assegurando diretório de usuário...'
+  mkdir -p "$(apache_user_home)"
+  chown --recursive "${APP_USER_ID}:$(id -g "$APP_USER_ID")" "$(apache_user_home)"
+}
+
+function setup_apache_user_envvars() {
   infom "Configurando usuário/grupo de execução do Apache..."
   export APACHE_RUN_USER="$(id -nu "$APP_USER_ID")"
   export APACHE_RUN_GROUP="$(id -ng "$APACHE_RUN_USER")"
   infov "Execução do Apache"
   infov '  * $APACHE_RUN_USER' "$APACHE_RUN_USER (ID: $APP_USER_ID)"
   infov '  * $APACHE_RUN_GROUP' "$APACHE_RUN_GROUP (ID: $(id -g "$APACHE_RUN_USER"))"
+}
+
+assert_apache_user
+
+if [[ "$APP_USER_ID" == '0' ]]; then
+  infom "\$APP_USER_ID é 0 (root). Apache executará com usuário padrão (Nenhuma alteração)"
+else
+  assert_apache_user_home
+  setup_apache_user_envvars
 fi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avmtrf1-tools
 version: !ruby/object:Gem::Version
-  version: 0.38.1
+  version: 0.38.2
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-20 00:00:00.000000000 Z
+date: 2022-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-selenium