Merge branch 'master' into feature/fluxos_image

RunOnFlux · Nov 27, 2024 · ffe3550 · ffe3550
2 parents 71ed7ac + fed1556
commit ffe3550
Show file tree

Hide file tree

Showing 17 changed files with 621 additions and 400 deletions.
diff --git a/HomeUI/dist/css/4593.css → HomeUI/dist/css/909.css b/HomeUI/dist/css/4593.css → HomeUI/dist/css/909.css
diff --git a/HomeUI/dist/js/4593.js b/HomeUI/dist/js/4593.js
diff --git a/HomeUI/dist/js/909.js b/HomeUI/dist/js/909.js
diff --git a/HomeUI/dist/js/index.js b/HomeUI/dist/js/index.js
diff --git a/HomeUI/src/views/apps/LocalApps.vue b/HomeUI/src/views/apps/LocalApps.vue
@@ -507,6 +507,7 @@
                       <b-button-toolbar>
                         <b-button-group size="sm">
                           <b-button
+                            v-if="isFluxAdminLoggedIn()"
                             :id="`start-installed-app-${row.item.name}`"
                             v-b-tooltip.hover.top="'Start App'"
                             :disabled="isAppInList(row.item.name, tableconfig.running.apps)"
@@ -527,6 +528,7 @@
                             @confirm="startApp(row.item.name)"
                           />
                           <b-button
+                            v-if="isFluxAdminLoggedIn()"
                             :id="`stop-installed-app-${row.item.name}`"
                             v-b-tooltip.hover.top="'Stop App'"
                             size="sm"
@@ -547,6 +549,7 @@
                             @confirm="stopApp(row.item.name)"
                           />
                           <b-button
+                            v-if="isFluxAdminLoggedIn()"
                             :id="`restart-installed-app-${row.item.name}`"
                             v-b-tooltip.hover.top="'Restart App'"
                             size="sm"

diff --git a/ZelBack/config/default.js b/ZelBack/config/default.js
@@ -9,6 +9,7 @@ module.exports = {
   server: {
     allowedPorts: [16127, 16137, 16147, 16157, 16167, 16177, 16187, 16197],
     apiport: 16127, // homeport is -1, ssl port is +1
+    fluxNodeServiceAddress: '169.254.43.43',
   },
   database: {
     url: '127.0.0.1',
@@ -160,7 +161,7 @@ module.exports = {
       port: 2, // additional price per enterprise port
       scope: 4, // additional price for application targetting specific nodes, private images
       staticip: 2, // additional price per application for targetting nodes that have static ip address
-      fluxmultiplier: 0.9, // discount given if payed with flux 1 would be 0%
+      fluxmultiplier: 0.95, // discount given if payed with flux 1 would be 0%
       multiplier: 1, // multiplier in case we want to increase prices globaly
       minUSDPrice: 0.99, // min. usd price that can be paid with stripe/paypal.
     },