chore: fix reload nginx on apply

elibosley · elibosley · commit 450a03e466f1 · 2025-04-25T13:16:04.000-04:00
diff --git a/api/src/unraid-api/graph/resolvers/customization/customization.service.ts b/api/src/unraid-api/graph/resolvers/customization/customization.service.ts
@@ -8,6 +8,7 @@ import * as ini from 'ini';
 
 import { emcmd } from '@app/core/utils/clients/emcmd.js';
 import { fileExists } from '@app/core/utils/files/file-exists.js';
+import { reloadNginxAndUpdateDNS } from '@app/store/actions/reload-nginx-and-update-dns.js';
 import { getters } from '@app/store/index.js';
 import { ActivationCode } from '@app/unraid-api/graph/resolvers/customization/activation-code.model.js';
 
@@ -24,10 +25,6 @@ export class CustomizationService implements OnModuleInit {
     private activationData: ActivationCode | null = null;
 
     async createOrGetFirstBootSetupFlag(): Promise<boolean> {
-        // Ensure directory exists first
-        // Note: this.activationDir might not be initialized yet if called before onModuleInit
-        // It relies on being called within or after onModuleInit workflow.
-        // If called independently, it needs the path value passed or initialized differently.
         await fs.mkdir(this.activationDir, { recursive: true });
         if (await fileExists(this.hasRunFirstBootSetup)) {
             this.logger.log('First boot setup flag file already exists.');
@@ -153,7 +150,7 @@ export class CustomizationService implements OnModuleInit {
 
     public convertWebGuiPathToAssetPath(webGuiPath: string): string {
         // Strip the leading /usr/local/emhttp/ from the path
-        const assetPath = webGuiPath.replace('/usr/local/emhttp/', '');
+        const assetPath = webGuiPath.replace('/usr/local/emhttp/', '/');
         return assetPath;
     }
 
@@ -365,7 +362,7 @@ export class CustomizationService implements OnModuleInit {
     }
 
     private async applyServerIdentity() {
-        const { getters } = await import('@app/store/index.js');
+        const { getters, store } = await import('@app/store/index.js');
         if (!this.activationData) {
             this.logger.warn('No activation data available for server identity setup.');
             return;
@@ -402,14 +399,18 @@ export class CustomizationService implements OnModuleInit {
 
         try {
             // Update ident.cfg first
-            await this.updateCfgFile(this.identCfg, null, paramsToUpdate); // Update keys directly in the file
+            await this.updateCfgFile(this.identCfg, null, paramsToUpdate);
             this.logger.log(`Server identity updated in ${this.identCfg}`);
 
             // Trigger emhttp update via emcmd
-            const updateParams = { ...paramsToUpdate, changeNames: 'Apply' }; // Prepare params for emcmd
-            this.logger.log(`Calling emcmd with params:`, updateParams); // Log the params
-            await emcmd(updateParams); // Use emcmd utility
+            const updateParams = { ...paramsToUpdate, changeNames: 'Apply' };
+            this.logger.log(`Calling emcmd with params:`, updateParams);
+            await emcmd(updateParams);
             this.logger.log('emcmd executed successfully.');
+
+            // Reload nginx and update DNS
+            await store.dispatch(reloadNginxAndUpdateDNS());
+            this.logger.log('Nginx reloaded and DNS updated successfully.');
         } catch (error) {
             this.logger.error('Error applying server identity:', error);
         }
diff --git a/web/components/Activation/WelcomeModal.ce.vue b/web/components/Activation/WelcomeModal.ce.vue
@@ -1,18 +1,21 @@
 <script setup lang="ts">
 import { useI18n } from 'vue-i18n';
+import { storeToRefs } from 'pinia';
 
 import { BrandButton } from '@unraid/ui';
 
 import ActivationPartnerLogo from '~/components/Activation/ActivationPartnerLogo.vue';
 import ActivationSteps from '~/components/Activation/ActivationSteps.vue';
 import { useActivationCodeDataStore } from '~/components/Activation/store/activationCodeData';
 import Modal from '~/components/Modal.vue';
-import { storeToRefs } from 'pinia';
+import { useThemeStore } from '~/store/theme';
 
 const { t } = useI18n();
 
 const { partnerInfo, loading } = storeToRefs(useActivationCodeDataStore());
 
+useThemeStore();
+
 const title = computed<string>(() =>
   partnerInfo.value?.partnerName
     ? t(`Welcome to your new {0} system, powered by Unraid!`, [partnerInfo.value?.partnerName])
