From 3543c9cacae7595eb62c7967d58ad365194cb70e Mon Sep 17 00:00:00 2001
From: kurtjstrosahl-jlab
 <63591612+kurtjstrosahl-jlab@users.noreply.github.com>
Date: Thu, 26 Oct 2023 12:56:01 -0400
Subject: [PATCH 1/2] Update JLab-Farm.yaml

adding entry for moller project submit host
---
 .../JLAB/JLab-Farm.yaml                       | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/topology/Thomas Jefferson National Accelerator Facility/JLAB/JLab-Farm.yaml b/topology/Thomas Jefferson National Accelerator Facility/JLAB/JLab-Farm.yaml
index 073f8af1b..13d319cb0 100644
--- a/topology/Thomas Jefferson National Accelerator Facility/JLAB/JLab-Farm.yaml	
+++ b/topology/Thomas Jefferson National Accelerator Facility/JLAB/JLab-Farm.yaml	
@@ -141,7 +141,35 @@ Resources:
       JLab: 100
     Tags:
       - OSPool
-           
+        
+  osg-moller:
+    Active: true
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: 818acb7ebcd1865a17551799f0cfeb5256e0db20
+          Name: Kurt Strosahl
+        Secondary:
+          ID: ea9db644eb6f8632cf87fd2cbac8a6e393c21f71
+          Name: Wesley Moore
+      Security Contact:
+        Primary:
+          ID: 818acb7ebcd1865a17551799f0cfeb5256e0db20
+          Name: Kurt Strosahl
+    Description: Submit node for JLab
+    FQDN: osg-moller.jlab.org
+    DN: /DC=org/DC=incommon/C=US/ST=Virginia/L=Newport News/O=Thomas Jefferson National Accelerator Facility/OU=SciComp/CN=osg-moller.jlab.org
+    ID: 1452
+    Services:
+      Submit Node:
+        Description: OSG Submission Node
+        Details:
+          hidden: false
+    VOOwnership:
+      JLab: 100
+    Tags:
+      - OSPool
+      
   JLab-StashCache-Origin:
     Active: true
     ContactLists:

From fadeaa843ffb8a47d6960d54d231c2d00f750aca Mon Sep 17 00:00:00 2001
From: Matyas Selmeci <matyas@cs.wisc.edu>
Date: Fri, 27 Oct 2023 19:39:21 -0500
Subject: [PATCH 2/2] Update topology/Thomas Jefferson National Accelerator
 Facility/JLAB/JLab-Farm.yaml

---
 .../JLAB/JLab-Farm.yaml                                          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/topology/Thomas Jefferson National Accelerator Facility/JLAB/JLab-Farm.yaml b/topology/Thomas Jefferson National Accelerator Facility/JLAB/JLab-Farm.yaml
index 13d319cb0..f085f5ac0 100644
--- a/topology/Thomas Jefferson National Accelerator Facility/JLAB/JLab-Farm.yaml	
+++ b/topology/Thomas Jefferson National Accelerator Facility/JLAB/JLab-Farm.yaml	
@@ -159,7 +159,6 @@ Resources:
     Description: Submit node for JLab
     FQDN: osg-moller.jlab.org
     DN: /DC=org/DC=incommon/C=US/ST=Virginia/L=Newport News/O=Thomas Jefferson National Accelerator Facility/OU=SciComp/CN=osg-moller.jlab.org
-    ID: 1452
     Services:
       Submit Node:
         Description: OSG Submission Node