Merge branch 'dmwm:master' into master

docker/frontend/Dockerfile

@@ -54,6 +54,12 @@ RUN crontab /data/crontab.txt
 ADD run.sh $WDIR/run.sh
 ADD monitor.sh $WDIR/monitor.sh
 ADD alerts.sh $WDIR/alerts.sh
+COPY authmap-prod.cron /tmp/authmap-prod.cron
+COPY authmap-preprod.cron /tmp/data/tools/authmap-preprod.cron
+COPY authmap-test.cron /tmp/authmap-test.cron
+COPY copy_cron.sh $WDIR/copy_cron.sh
+
+
 
 ENV PATH="${WDIR}/cmsweb/bin:${WDIR}:${WDIR}/gopath/bin:${PATH}"
 

docker/frontend/authmap-preprod.cron

@@ -0,0 +1,2 @@
+*/15 * * * * sleep $((RANDOM % 601)); /data/srv/current/config/frontend/mkauthmap  -c /data/srv/current/config/frontend/mkauth.conf -o /data/srv/state/frontend/etc/authmap.json --cert /etc/robots/robotcert.pem --key /etc/robots/robotkey.pem --ca-cert /etc/ssl/certs/CERN-bundle.pem ; [ $? -ne 0 ] && /bin/bash /data/alerts.sh
+

docker/frontend/authmap-prod.cron

@@ -0,0 +1,2 @@
+*/15 * * * * sleep $((RANDOM % 601)); /data/srv/current/config/frontend/mkauthmap  -c /data/srv/current/config/frontend/mkauth.conf -o /data/srv/state/frontend/etc/authmap.json --cert /etc/robots/robotcert.pem --key /etc/robots/robotkey.pem --ca-cert /etc/ssl/certs/CERN-bundle.pem ; [ $? -ne 0 ] && /bin/bash /data/alerts.sh
+

docker/frontend/authmap-test.cron

@@ -0,0 +1,2 @@
+*/30 * * * * sleep $((RANDOM % 901)); /data/srv/current/config/frontend/mkauthmap  -c /data/srv/current/config/frontend/mkauth.conf -o /data/srv/state/frontend/etc/authmap.json --cert /etc/robots/robotcert.pem --key /etc/robots/robotkey.pem --ca-cert /etc/ssl/certs/CERN-bundle.pem ; [ $? -ne 0 ] && /bin/bash /data/alerts.sh
+

docker/frontend/copy_cron.sh

@@ -0,0 +1,17 @@
+if [ "$ENVIRONMENT" = "k8s-prod" ]; then
+  # Copy the production cron file
+  echo "Copying authmap-prod.cron"
+  cp /tmp/authmap-prod.cron /tmp/authmap.cron
+elif [ "$ENVIRONMENT" = "k8s-preprod" ]; then
+  # Copy the development cron file
+  echo "Copying authmap-preprod.cron"
+  cp /tmp/authmap-preprod.cron /tmp/authmap.cron
+elif [[ "$ENVIRONMENT" == k8s-test* ]]; then
+  # Copy the test cron file
+  echo "Copying authmap-test.cron"
+  cp /tmp/authmap-test.cron /tmp/authmap.cron
+
+else
+  echo "Unsupported environment: $ENVIRONMENT"
+  exit 1
+fi

docker/frontend/install.sh

@@ -121,5 +121,8 @@ crontab -l | \
 # add proxy generation via robot certificate
 crontab -l | egrep -v "reboot|ProxyRenew|LogArchive|ServerMonitor" > /tmp/mycron
 echo "0 0 * * * sudo /usr/sbin/fetch-crl" >> /tmp/mycron
+sed -i '/mkauthmap/d' /tmp/mycron
+chmod +x copy_cron.sh && ./copy_cron.sh && cat /tmp/authmap.cron >> /tmp/mycron
+
 crontab /tmp/mycron
 rm /tmp/mycron

docker/pypi/wmagent/Dockerfile

@@ -30,6 +30,7 @@ ENV WMA_LOG_DIR=$WMA_CURRENT_DIR/logs
 ENV WMA_DEPLOY_DIR=/usr/local
 ENV WMA_ENV_FILE=$WMA_DEPLOY_DIR/deploy/env.sh
 ENV WMA_SECRETS_FILE=$WMA_ADMIN_DIR/WMAgent.secrets
+ENV ORACLE_PATH=$WMA_DEPLOY_DIR/etc/oracle
 
 
 # Setting up users and previleges
@@ -62,5 +63,9 @@ WORKDIR ${WMA_ROOT_DIR}
 USER ${WMA_USER}
 ENV USER=$WMA_USER
 
-# Define the entrypoint.
-ENTRYPOINT ["./run.sh"]
+# Define the entrypoint (Using exec Form):
+ENTRYPOINT ["./run.sh", "2>&1"]
+
+# # Define the entrypoint (Using shell Form):
+# SHELL ["/bin/bash", "-c"]
+# ENTRYPOINT /data/run.sh 2>&1

docker/pypi/wmagent/README.md

@@ -348,8 +348,8 @@ They are set at different moments along the process: i.e. at `buildtime` - when
 
 * **List  of variables set at `configtime` defined in $WMAgent.secrets file:**
 
-   * MYSQL_USER=*****
-   * MYSQL_PASS=*****
+   * MDB_USER=*****
+   * MDB_PASS=*****
 
     or