Merge pull request #1570 from todor-ivanov/WMAgent_MinorDeployConfigs…

…_fix-12182 Reduce tweaking at deploy time
dmwm · Nov 30, 2024 · 0d9d5b1 · 0d9d5b1
2 parents 7c8785f + 7adc434
commit 0d9d5b1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/docker/pypi/wmagent/Dockerfile b/docker/pypi/wmagent/Dockerfile
@@ -36,6 +36,13 @@ ENV WMA_MANAGE_DIR=$WMA_DEPLOY_DIR/bin
 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
+ENV RUCIO_HOME=$WMA_CONFIG_DIR
+ENV X509_HOST_CERT=$WMA_CERTS_DIR/servicecert.pem
+ENV X509_HOST_KEY=$WMA_CERTS_DIR/servicekey.pem
+ENV X509_USER_CERT=$WMA_CERTS_DIR/servicecert.pem
+ENV X509_USER_KEY=$WMA_CERTS_DIR/servicekey.pem
+ENV X509_USER_PROXY=$WMA_CERTS_DIR/myproxy.pem
+
 
 # Add all deployment needed directories
 ADD bin $WMA_DEPLOY_DIR/bin

diff --git a/docker/pypi/wmagent/install.sh b/docker/pypi/wmagent/install.sh
@@ -130,11 +130,6 @@ tweakEnv(){
     sed -i "s|install=.*|install=\$WMA_INSTALL_DIR|g" $WMA_ENV_FILE
     sed -i "s|config=.*|config=\$WMA_CONFIG_DIR|g" $WMA_ENV_FILE
     sed -i "s|manage=.*|manage=\$WMA_MANAGE_DIR/manage|g" $WMA_ENV_FILE
-    sed -i "s|RUCIO_HOME=.*|RUCIO_HOME=\$WMA_CONFIG_DIR|g" $WMA_ENV_FILE
-
-    echo "Edit $WMA_DEPLOY_DIR/deploy/renew_proxy.sh script to point to \$WMA_ROOT_DIR"
-    sed -i "s|/data/|\$WMA_ROOT_DIR/|g" $WMA_DEPLOY_DIR/deploy/renew_proxy.sh
-    sed -i "s|source.*env\.sh|source \$WMA_ENV_FILE|g" $WMA_DEPLOY_DIR/deploy/renew_proxy.sh
 
     cat <<EOF >> $WMA_ENV_FILE