diff --git a/app/__init__.py b/app/__init__.py index f8a56ee..e033a6b 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -4,6 +4,7 @@ from flask_bootstrap import Bootstrap from flask_mail import Mail from flask_sqlalchemy import SQLAlchemy from flask_login import LoginManager +from flask_pagedown import PageDown from flask_wtf.csrf import CSRFProtect, CSRFError from flask_babel import Babel, lazy_gettext from flask_moment import Moment @@ -34,6 +35,7 @@ mail = Mail() mail.init_app(app) bootstrap = Bootstrap() bootstrap.init_app(app) +pagedown = PageDown(app) csrf = CSRFProtect(app) #csrf.init_app(app) babel = Babel() diff --git a/app/panel/routes.py b/app/panel/routes.py index 8b5f738..604a8b6 100644 --- a/app/panel/routes.py +++ b/app/panel/routes.py @@ -97,7 +97,8 @@ def dashboard(user_pid): if not current_user.is_administrator(): send_email(current_app.config['MAIL_USERNAME'], '{} experienced an error'.format(cuser.email), 'vmanager/email/adm_unreachable', user=current_user, unit_id=unit_id, error=repr(e)) continue - return render_template('panel/dashboard.html', sys_regions=sys_regions, inv_deployments=inv_deployments, inv_services=inv_services, inv_domains=inv_domains, inv_addresses=inv_addresses, rrd=rrd, status=statuses, warnflag=warnflag, regions=regions) + supportform = MessageForm() + return render_template('panel/dashboard.html', sys_regions=sys_regions, inv_deployments=inv_deployments, inv_services=inv_services, inv_domains=inv_domains, inv_addresses=inv_addresses, rrd=rrd, status=statuses, warnflag=warnflag, regions=regions, form=supportform) #SUPPORT diff --git a/app/static/datapoint.seed b/app/static/datapoint.seed index 5f8f6aa..3157094 100644 --- a/app/static/datapoint.seed +++ b/app/static/datapoint.seed @@ -79,7 +79,7 @@ d-i base-installer/kernel/image string linux-generic d-i passwd/user-fullname string ubuntu-user d-i passwd/username string ubuntu -d-i passwd/user-password-crypted password $6$HVqIDE43CsBb$JecrxJll8LUED03dz1KjS8Peek7dKVS0lR.1girEOGbh8XWh.cBFlpds9aREaDAptd8U5bLEW8ZOx8htjjPLr/ +d-i passwd/user-password-crypted password $6$NafeQeIx$uKRfMInxDw3vcGFML74rdjupfENDwbltlAVoJfRzMWtJu3qN2Sl0j3IBK9dYIYQtyEZZ3wKQn6ECLrHWEf8rj/ d-i user-setup/allow-password-weak boolean true d-i passwd/user-default-groups string sudo d-i user-setup/encrypt-home boolean false diff --git a/app/static/datapoint.sh b/app/static/datapoint.sh index 25bb22e..6c01b09 100644 --- a/app/static/datapoint.sh +++ b/app/static/datapoint.sh @@ -24,6 +24,12 @@ update-grub ################################################################################ #curl -sSL https://get.docker.com/ | sh +apt install docker.io + +# install portainer +#docker run -d -p 9000:9000 portainer/portainer +#run with root access to host socket. +docker run -d -p 9000:9000 --restart always -v /var/run/docker.sock:/var/run/docker.sock -v /opt/portainer:/data portainer/portainer ################################################################################ ## install Gitlab CI Multirunner @@ -53,3 +59,6 @@ update-grub ################################################################################ #chage -d 0 gitlab-ci + +#shutdown at the end +shutdown -h now diff --git a/app/templates/nav.html b/app/templates/nav.html index a2c2d61..058f17f 100644 --- a/app/templates/nav.html +++ b/app/templates/nav.html @@ -52,7 +52,7 @@
- {% with support=deploy.discussion %} + {% with support=deploy.topic %} {% include "panel/support_item.html" %} {% endwith %}