Merge pull request #235 from tmaeno/master

moved darkside stuff to panda-k8s

Dockerfile

@@ -54,14 +54,6 @@ RUN mkdir /tmp/gtemp &&  \
 RUN dnf install -y https://repo.opensciencegrid.org/osg/3.6/el9/release/x86_64/osg-ca-certs-1.114-2.osg36.el9.noarch.rpm
 RUN dnf install -y https://repo.opensciencegrid.org/osg/3.6/el9/release/x86_64/vo-client-131-1.osg36.el9.noarch.rpm
 
-# LSC file for the darkside VOMS server
-RUN mkdir -p /etc/grid-security/vomsdir/vo.darkside.org && \
-    echo "/DC=org/DC=terena/DC=tcs/C=IT/ST=Roma/O=Istituto Nazionale di Fisica Nucleare/CN=vomsmania.cnaf.infn.it" > /etc/grid-security/vomsdir/vo.darkside.org/vomsmania.cnaf.infn.it.lsc && \
-    echo "/C=NL/O=GEANT Vereniging/CN=GEANT eScience SSL CA 4" >> /etc/grid-security/vomsdir/vo.darkside.org/vomsmania.cnaf.infn.it.lsc
-
-# vomses file to refer to the darkside VOMS server
-RUN echo "\"vo.darkside.org\" \"vomsmania.cnaf.infn.it\" \"15008\" \"/DC=org/DC=terena/DC=tcs/C=IT/ST=Roma/O=Istituto Nazionale di Fisica Nucleare/CN=vomsmania.cnaf.infn.it\" \"vo.darkside.org\"" >> /etc/vomses
-
 # setup venv with pythonX.Y
 RUN python$(echo ${PYTHON_VERSION} | sed -E 's/\.[0-9]+$//') -m venv /opt/harvester
 RUN /opt/harvester/bin/pip install -U pip
@@ -105,7 +97,8 @@ RUN chmod -R 777 /data/harvester
 RUN chmod -R 777 /data/condor
 RUN chmod -R 777 /etc/httpd
 RUN chmod -R 777 /etc/vomses
-RUN chmod -R 777 /etc/grid-security/vomsdir/lsst
+
+RUN chmod -R 777 /etc/grid-security/vomsdir
 RUN chmod -R 777 /var/log/httpd
 RUN chmod -R 777 /var/lib/logrotate
 RUN mkdir -p /opt/harvester/etc/queue_config && chmod 777 /opt/harvester/etc/queue_config
@@ -150,7 +143,7 @@ mv condor-*stripped condor \n\
 cd condor \n\
 ./bin/make-personal-from-tarball \n\
 . condor.sh \n\
-cp /data/harvester/condor_config.local /data/condor/condor/local/config.d/ \n\
+ln -s /data/harvester/condor_config.local /data/condor/condor/local/config.d/ \n\
 condor_master \n\
 /sbin/httpd \n\
 /opt/harvester/etc/rc.d/init.d/panda_harvester-uwsgi start \n ' > /opt/harvester/etc/rc.d/init.d/run-harvester-services

pandaharvester/panda_pkg_info.py

@@ -1 +1 @@
-release_version = "0.5.5"
+release_version = "0.5.6"