-
Notifications
You must be signed in to change notification settings - Fork 81
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' of https://github.com/CometVisu/CometVisu into…
… design_ceramic
- Loading branch information
Showing
40 changed files
with
11,314 additions
and
391 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
# The base for this container is defined at | ||
# https://github.com/CometVisu/Docker/tree/master/CometVisuBase | ||
# and available in the DockerHub at | ||
# https://hub.docker.com/r/cometvisu/cometvisuabstractbase/ | ||
FROM cometvisu/cometvisuabstractbase:latest | ||
|
||
# Not required but makes the debugging work a bit more easy (might be removed in future): | ||
RUN { \ | ||
echo "export LS_OPTIONS='--color=auto'"; \ | ||
echo "eval \"`dircolors`\""; \ | ||
echo "alias ls='ls \$LS_OPTIONS'"; \ | ||
echo "alias ll='ls \$LS_OPTIONS -l'"; \ | ||
echo "alias l='ls \$LS_OPTIONS -lA'"; \ | ||
} | tee -a "/root/.bashrc" | ||
|
||
# Fill the labels to keep build information: | ||
ARG TRAVIS_JOB_NUMBER | ||
ARG TRAVIS_JOB_WEB_URL | ||
ARG TRAVIS_BUILD_WEB_URL | ||
ARG BUILD_DATE | ||
ARG VCS_REF | ||
ARG VERSION_TAG | ||
|
||
# Own labels | ||
LABEL org.cometvisu.travis-job-number=$TRAVIS_JOB_NUMBER | ||
LABEL org.cometvisu.travis-job-web-url=$TRAVIS_JOB_WEB_URL | ||
LABEL org.cometvisu.travis-build-web-url=$TRAVIS_BUILD_WEB_URL | ||
# Labels according to http://label-schema.org/rc1/ | ||
LABEL org.label-schema.build-date=$BUILD_DATE | ||
LABEL org.label-schema.vcs-ref=$VCS_REF | ||
LABEL org.label-schema.version=$VERSION_TAG | ||
|
||
# Fill the web root with the current build: | ||
COPY build/ /var/www/html/ | ||
|
||
VOLUME /var/www/html/resource/config |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
.. _hidden-config: | ||
|
||
Versteckte Konfigurationen | ||
========================== | ||
|
||
Hintergrund | ||
----------- | ||
|
||
Die "Versteckten Konfigurationen" sind Konfigurationsdaten die nicht an den Client übertragen werden und auf dem | ||
Server bleiben. Daher werden diese vor dem Anwender "versteckt", sind aber auf dem Server selbst im Klartext lesbar. | ||
Auch im Manager sind diese Informationen im Klartext lesbar. | ||
|
||
Dies erzeugt für sich noch keine sichere Umgebung. Jedoch lässt sich hierdurch eine sichere Umgebung aufbauen, in | ||
dem der Webserver so konfiguriert sein muss, dass der Anwender keinen Zugriff auf den Manager erhält. | ||
|
||
Ob und in welcher Form Widgets und Plugins Informationen aus der versteckten | ||
Konfiguration benötigen wird in deren jeweiligen Dokumentation beschrieben. | ||
|
||
Aufbau | ||
------ | ||
|
||
Die versteckten Konfigurationen werden in der Datei ``config/hidden.php`` abgelegt. Diese Datei kann sowohl | ||
über einen normalen Text-Editor als auch über den :ref:`Manager <manager>` editiert werden. | ||
|
||
Der Inhalt besteht aus mehreren Einträgen die einen `Name` mit mehreren `Schlüssel` und `Wert` Paaren enthalten. | ||
In der Datei selbst werden diese Informationen als PHP Array abgelegt: | ||
|
||
.. code-block:: php | ||
<?php | ||
// File for configurations that shouldn't be shared with the user | ||
$hidden = array( | ||
'fritzbox' => array('uri' => 'https://192.168.0.1:49443/', 'user' => 'CometVisuTestUser', 'pass' => 'pa3bvNM4j9z4') | ||
'influx' => array('user' => 'InfluxDBTestUser', 'pass' => 'Xsdwfw324SEs') | ||
); | ||
?> | ||
Manager | ||
------- | ||
|
||
Komfortabel lässt sich der Inhalt der versteckten Konfiguration über den :ref:`Manager <manager>` editieren. | ||
|
||
.. figure:: _static/hidden_config_de.png | ||
|
||
Bekannte ``Name`` Einträge | ||
-------------------------- | ||
|
||
Auch wenn die Wahl für den ``Name`` grundsätzlich frei ist, so gibt es dafür übliche Einträge, bei denen es sich | ||
anbietet diesem Schema zu folgen. So können manche Widgets bzw. Plugins ohne eine explizite Konfiguration in dem | ||
für dafür üblichen Namen nach Einträgen suchen, wodurch sich der Konfigurations-Aufwand reduzieren lässt. | ||
|
||
======== ============== ======= | ||
Name Verwendung Default | ||
======== ============== ======= | ||
fritzbox :ref:`tr064` | ||
influx :ref:`diagram` X | ||
======== ============== ======= |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule qooxdoo
updated
76 files
Oops, something went wrong.