Merge pull request #1 from redBorder/bug/#16491_rb_arubacentral_latest

adaptations for latest changes of the service
redBorder · Apr 8, 2024 · a6ab1b5 · a6ab1b5
2 parents d57087d + a5b62d7
commit a6ab1b5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/packaging/rpm/Makefile b/packaging/rpm/Makefile
@@ -18,10 +18,8 @@ SOURCES:
 
 archive: SOURCES
 	cd ../../ && \
-	tar --exclude=packaging/rpm/SOURCES/ --exclude=.git/ -cvf packaging/rpm/SOURCES/$(PACKAGE_NAME)-$(VERSION).tar.gz \
-	    --transform 's%^./%$(PACKAGE_NAME)-$(VERSION)/%' .	
-	#git archive --prefix=$(PACKAGE_NAME)-$(VERSION)/ \
-	#	-o packaging/rpm/SOURCES/$(PACKAGE_NAME)-$(VERSION).tar.gz $(LATEST)
+	git archive --prefix=$(PACKAGE_NAME)-$(VERSION)/ \
+		-o packaging/rpm/SOURCES/$(PACKAGE_NAME)-$(VERSION).tar.gz $(LATEST)
 
 
 build_prepare: archive

diff --git a/resources/templates/default/config.erb b/resources/templates/default/config.erb
@@ -1,7 +1,7 @@
-sensors:
 <%  @arubacentral_nodes.each_with_index do |arubacentral_node, i| %>
 <% if arubacentral_node["redborder"]["parent_id"].nil? %>
-  -
+sensors:
+  -  
        sensor_name: <%= arubacentral_node["rbname"] %>
        gateway: '<%= arubacentral_node["arubacentral_url"] %>'
        email: '<%= arubacentral_node["arubacentral_username"] %>'
@@ -28,4 +28,10 @@ flow_sensors:
        sensor_uuid: <%= flow_node_with_aps["redborder"]["sensor_uuid"] %>
        access_points: <%= flow_node_with_aps.fetch("access_points", {}).values %>
 <% end %>
-
+cache:
+  ttl:
+    fetch_all_campuses: 86400
+    fetch_campus: 86400
+    fetch_building: 86400
+  keys: ["fetch_all_campuses", "fetch_campus", "fetch_building"]
+