diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 4d6d647b..00000000 --- a/.gitignore +++ /dev/null @@ -1,113 +0,0 @@ -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -#image -image/*.jpeg - -# C extensions -*.so - -# Distribution / packaging -.Python -env/ -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ -*.egg-info/ -.installed.cfg -*.egg - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*.cover -.hypothesis/ - -# Translations -*.mo -*.pot - -# Django stuff: -*.log -local_settings.py - -# Flask stuff: -instance/ -.webassets-cache - -# Scrapy stuff: -.scrapy - -# Sphinx documentation -docs/_build/ - -# PyBuilder -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# pyenv -.python-version - -# celery beat schedule file -celerybeat-schedule - -# SageMath parsed files -*.sage.py - -# dotenv -.env - -# virtualenv -.venv -venv/ -ENV/ - -# Spyder project settings -.spyderproject -.spyproject - -# Rope project settings -.ropeproject - -# mkdocs documentation -/site - -# mypy -.mypy_cache/ - -#data user -app/certs -map*.png -app/haproxy-wi.db -keys -lists -log -configs diff --git a/app/options.py b/app/options.py index e0c1c4c0..0b230e74 100644 --- a/app/options.py +++ b/app/options.py @@ -1869,7 +1869,7 @@ if form.getvalue('updatessh'): if form.getvalue('ssh_cert'): user_group = funct.get_user_group() name = form.getvalue('name') - # name = name + '_' + user_group + name = name + '_' + user_group if not os.path.exists(os.getcwd()+'/keys/'): os.makedirs(os.getcwd()+'/keys/') diff --git a/config_other/httpd/haproxy-wi.conf b/config_other/httpd/haproxy-wi.conf index 4660c0db..dc8a7b73 100644 --- a/config_other/httpd/haproxy-wi.conf +++ b/config_other/httpd/haproxy-wi.conf @@ -6,7 +6,7 @@ SSLCertificateFile /var/www/haproxy-wi/app/certs/haproxy-wi.crt SSLCertificateKeyFile /var/www/haproxy-wi/app/certs/haproxy-wi.key - ServerName haprox-wi.example.com + ServerName haproxy-wi.example.com ErrorLog /var/log/httpd/haproxy-wi.error.log CustomLog /var/log/httpd/haproxy-wi.access.log combined TimeOut 600