Return captive_portal and web_server

esphome/nspanel_esphome_advanced.yaml

@@ -11,7 +11,6 @@ substitutions:
   ##### Do not change this here.  #####
   ##### Set your substitutions on #####
   ##### your base yaml file.      #####
-  web_password: ${wifi_password}
   #####################################
 
 button:
@@ -27,8 +26,6 @@ button:
       - logger.log: "Button pressed: Exit reparse"
       - script.execute: exit_reparse
 
-captive_portal:
-
 script:
   - id: exit_reparse
     mode: restart
@@ -96,10 +93,4 @@ time:
         - component.update: api_timestamp
         - component.update: device_timestamp
 
-web_server:
-  id: web_server_std
-  port: 80
-  auth:
-    username: admin
-    password: ${web_password}
 ...

esphome/nspanel_esphome_core.yaml

@@ -9,14 +9,15 @@ substitutions:
   ##############################
   ## Change only in your      ##
   ## local yaml substitutions ##
-  temp_units: "°C"
-  invalid_cooldown: "100ms"
-  ota_password: ${wifi_password}
-  ap_password: ${wifi_password}
   device_name: NSPanel
   name: ${device_name}
   friendly_name: ${device_name}
+  ap_password: ${wifi_password}
+  ota_password: ${wifi_password}
+  web_password: ${wifi_password}
   wifi_timeout: '15'
+  temp_units: "°C"
+  invalid_cooldown: "100ms"
   ##### DON'T CHANGE THIS ######
   version: "4.3dev"
   ##############################
@@ -107,6 +108,8 @@ wifi:
     then:
       - script.execute: watchdog
 
+captive_portal:
+
 ##### OTA PASSWORD #####
 ota:
   id: ota_std
@@ -160,6 +163,14 @@ time:
         - logger.log: "System clock synchronized"
         - script.execute: refresh_datetime
 
+##### Web server #####
+web_server:
+  id: web_server_std
+  port: 80
+  auth:
+    username: admin
+    password: ${web_password}
+
 ##### START - API CONFIGURATION #####
 api:
   id: api_server