Compare commits
3 Commits
s-allius/i
...
420-config
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3de23184aa | ||
|
|
bb2250bca1 | ||
|
|
e25aa5f922 |
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
|
|
||||||
## [unreleased]
|
## [unreleased]
|
||||||
|
|
||||||
|
- fix the paths to copy the config.example.toml file during proxy start
|
||||||
- add MQTT topic `dcu_power` for setting output power on DCUs
|
- add MQTT topic `dcu_power` for setting output power on DCUs
|
||||||
- Update ghcr.io/hassio-addons/base Docker tag to v17.2.5
|
- Update ghcr.io/hassio-addons/base Docker tag to v17.2.5
|
||||||
- fix a lot of pytest-asyncio problems in the unit tests
|
- fix a lot of pytest-asyncio problems in the unit tests
|
||||||
|
|||||||
@@ -4,5 +4,5 @@
|
|||||||
pytest-cov==6.1.1
|
pytest-cov==6.1.1
|
||||||
python-dotenv==1.1.0
|
python-dotenv==1.1.0
|
||||||
mock==5.2.0
|
mock==5.2.0
|
||||||
coverage==7.8.0
|
coverage==7.8.1
|
||||||
jinja2-cli==0.8.2
|
jinja2-cli==0.8.2
|
||||||
@@ -162,7 +162,8 @@ class Config():
|
|||||||
)
|
)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def init(cls, def_reader: ConfigIfc, log_path: str = '') -> None | str:
|
def init(cls, def_reader: ConfigIfc, log_path: str = '',
|
||||||
|
cnf_path: str = 'config') -> None | str:
|
||||||
'''Initialise the Proxy-Config
|
'''Initialise the Proxy-Config
|
||||||
|
|
||||||
Copy the internal default config file into the config directory
|
Copy the internal default config file into the config directory
|
||||||
@@ -173,12 +174,13 @@ and initialise the Config with the default configuration '''
|
|||||||
try:
|
try:
|
||||||
# make the default config transparaent by copying it
|
# make the default config transparaent by copying it
|
||||||
# in the config.example file
|
# in the config.example file
|
||||||
logging.debug('Copy Default Config to config.example.toml')
|
logging.info(
|
||||||
|
f'Copy Default Config to {cnf_path}config.example.toml')
|
||||||
|
|
||||||
shutil.copy2("default_config.toml",
|
shutil.copy2("cnf/default_config.toml",
|
||||||
"config/config.example.toml")
|
cnf_path + "config.example.toml")
|
||||||
except Exception:
|
except Exception as e:
|
||||||
pass
|
logging.error(e)
|
||||||
|
|
||||||
# read example config file as default configuration
|
# read example config file as default configuration
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -127,7 +127,8 @@ class Server():
|
|||||||
def build_config(self):
|
def build_config(self):
|
||||||
# read config file
|
# read config file
|
||||||
Config.init(ConfigReadToml(self.src_dir + "cnf/default_config.toml"),
|
Config.init(ConfigReadToml(self.src_dir + "cnf/default_config.toml"),
|
||||||
log_path=self.log_path)
|
log_path=self.log_path,
|
||||||
|
cnf_path=self.config_path)
|
||||||
ConfigReadEnv()
|
ConfigReadEnv()
|
||||||
ConfigReadJson(self.config_path + "config.json")
|
ConfigReadJson(self.config_path + "config.json")
|
||||||
ConfigReadToml(self.config_path + "config.toml")
|
ConfigReadToml(self.config_path + "config.toml")
|
||||||
|
|||||||
@@ -57,7 +57,7 @@
|
|||||||
<button href="#" class="w3-bar-item w3-button w3-padding-16 w3-hide-large w3-dark-grey w3-hover-black" onclick="w3_close()" title="close menu"><i class="fa fa-remove fa-fw"></i> Close Menu</button>
|
<button href="#" class="w3-bar-item w3-button w3-padding-16 w3-hide-large w3-dark-grey w3-hover-black" onclick="w3_close()" title="close menu"><i class="fa fa-remove fa-fw"></i> Close Menu</button>
|
||||||
<a href="{{ url_for('.index')}}" class="w3-bar-item w3-button w3-padding {% block menu1_class %}{% endblock %}"><i class="fa fa-network-wired fa-fw"></i> {{_('Connections')}}</a>
|
<a href="{{ url_for('.index')}}" class="w3-bar-item w3-button w3-padding {% block menu1_class %}{% endblock %}"><i class="fa fa-network-wired fa-fw"></i> {{_('Connections')}}</a>
|
||||||
<a href="{{ url_for('.mqtt')}}" class="w3-bar-item w3-button w3-padding {% block menu2_class %}{% endblock %}"><i class="fa fa-database fa-fw"></i> MQTT</a>
|
<a href="{{ url_for('.mqtt')}}" class="w3-bar-item w3-button w3-padding {% block menu2_class %}{% endblock %}"><i class="fa fa-database fa-fw"></i> MQTT</a>
|
||||||
<a href="{{ url_for('.notes')}}" class="w3-bar-item w3-button w3-padding {% block menu3_class %}{% endblock %}"><i class="fa fa-exclamation-triangle fa-fw"></i> {{_('Important Messages')}}</a>
|
<a href="{{ url_for('.notes')}}" class="w3-bar-item w3-button w3-padding {% block menu3_class %}{% endblock %}"><i class="fa fa-info fa-fw"></i> {{_('Important Messages')}}</a>
|
||||||
<a href="{{ url_for('.logging')}}" class="w3-bar-item w3-button w3-padding {% block menu4_class %}{% endblock %}"><i class="fa fa-file-export fa-fw"></i> {{_('Log Files')}}</a>
|
<a href="{{ url_for('.logging')}}" class="w3-bar-item w3-button w3-padding {% block menu4_class %}{% endblock %}"><i class="fa fa-file-export fa-fw"></i> {{_('Log Files')}}</a>
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
{% block title %}{{_("TSUN Proxy - Important Messages")}}{% endblock title %}
|
{% block title %}{{_("TSUN Proxy - Important Messages")}}{% endblock title %}
|
||||||
{% block menu3_class %}w3-blue{% endblock %}
|
{% block menu3_class %}w3-blue{% endblock %}
|
||||||
{% block headline %}<i class="fa fa-exclamation-triangle fa-fw"></i> {{_('Important Messages')}}{% endblock headline %}
|
{% block headline %}<i class="fa fa-info fa-fw"></i> {{_('Important Messages')}}{% endblock headline %}
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div id="notes-list"></div>
|
<div id="notes-list"></div>
|
||||||
{% endblock content%}
|
{% endblock content%}
|
||||||
|
|||||||
Reference in New Issue
Block a user