diff options
| -rw-r--r-- | INSTALLING.rst | 2 | ||||
| -rw-r--r-- | ansible/roles/web/files/gondul-template.service | 15 | ||||
| -rw-r--r-- | ansible/roles/web/handlers/main.yml | 3 | ||||
| -rw-r--r-- | ansible/roles/web/tasks/main.yml | 5 | ||||
| -rw-r--r-- | web/index.html | 4 | ||||
| -rw-r--r-- | web/js/nms-map.js | 2 | ||||
| -rw-r--r-- | web/js/nms-ui-switch.js | 2 |
7 files changed, 25 insertions, 8 deletions
diff --git a/INSTALLING.rst b/INSTALLING.rst index 3920775..5770c9f 100644 --- a/INSTALLING.rst +++ b/INSTALLING.rst @@ -33,7 +33,7 @@ As root: As ``$YOURUSER``:: - $ git clone https://github.com/tech-server/gondul.git + $ git clone https://github.com/gathering/gondul.git $ cd gondul/ansible $ ansible-playbook -i inventory-localhost site.yml diff --git a/ansible/roles/web/files/gondul-template.service b/ansible/roles/web/files/gondul-template.service new file mode 100644 index 0000000..7a2a231 --- /dev/null +++ b/ansible/roles/web/files/gondul-template.service @@ -0,0 +1,15 @@ +[Unit] +Description=Gondul Templating +Documentation=http://google.com +After=network-online.target + +[Service] +ExecStart=/opt/gondul/templating/templating.py -h ::1 -p 8081 -t /opt/gondul/web/templates/ +MountFlags=slave +LimitNOFILE=1048576 +LimitNPROC=1048576 +LimitCORE=infinity + +[Install] +WantedBy=multi-user.target + diff --git a/ansible/roles/web/handlers/main.yml b/ansible/roles/web/handlers/main.yml index 4550f9d..77d887b 100644 --- a/ansible/roles/web/handlers/main.yml +++ b/ansible/roles/web/handlers/main.yml @@ -19,4 +19,5 @@ - name: reload systemd systemd: - daemon_reload: yes
\ No newline at end of file + daemon_reload: yes + diff --git a/ansible/roles/web/tasks/main.yml b/ansible/roles/web/tasks/main.yml index 466dec8..9d2ff2b 100644 --- a/ansible/roles/web/tasks/main.yml +++ b/ansible/roles/web/tasks/main.yml @@ -102,5 +102,6 @@ - name: add systemd service file for gondul-template copy: dest: /etc/systemd/system/gondul-template.service - src: template.service - notify: restart gondul-template
\ No newline at end of file + src: gondul-template.service + notify: restart gondul-template + diff --git a/web/index.html b/web/index.html index 23431b1..5e04beb 100644 --- a/web/index.html +++ b/web/index.html @@ -275,8 +275,8 @@ </div> </div> </div> - <div id="genericPanelContainer" style="ma-width: 60%; position: absolute; display: grid; grid-template-coumns: repeat(auto-fit,minmax(30%,100%));grid-gap: 10px; z-index: 120;"> - <div id="info-box-container" class="hidden" style="grid-column: 1 / auto; max-width: 700px; min-width: 500px;"> </div> + <div id="genericPanelContainer" style="max-width: 60%; position: absolute; display: grid; grid-template-coumns: repeat(auto-fit,minmax(30%,100%));grid-gap: 10px; z-index: 120;"> + <div id="info-box-container" class="hidden" style="grid-column: 1 / auto; max-width: 800px; min-width: 700px;"> </div> </div> </div> diff --git a/web/js/nms-map.js b/web/js/nms-map.js index 179d8e5..d5bc044 100644 --- a/web/js/nms-map.js +++ b/web/js/nms-map.js @@ -565,7 +565,7 @@ nmsMap._moveSubmit = function() { var myData = JSON.stringify([data]); $.ajax({ type: "POST", - url: "/api/write/switch-update", + url: "/api/write/switches", dataType: "text", data:myData, success: function (data, textStatus, jqXHR) { diff --git a/web/js/nms-ui-switch.js b/web/js/nms-ui-switch.js index f66a2b2..b7cbc7c 100644 --- a/web/js/nms-ui-switch.js +++ b/web/js/nms-ui-switch.js @@ -28,7 +28,7 @@ class nmsNewNet extends nmsPanel { class nmsModThing extends nmsBox { constructor(data) { - super("div",{html:{className: "panel-body"}}); + super("div"); this.identifier = data.identifier; this.invalidate = data.invalidate; this.api = data.api; |