new options - wiki_web

docs/wiki/foswiki/data/DefaultATSTemplate.txt

@@ -1,10 +1,10 @@
 ---+!!  %FORMFIELD{"DeviceType" topic="%BASETOPIC%"}%  %FORMFIELD{"DnsName" topic="%BASETOPIC%"}%
 
-%INCLUDE{IncludeATSPhoneList}%
+%INCLUDE{IncludeFindATSPhoneList}%
 
 %INCLUDE{IncludeNetDevCommon}%
 
-%INCLUDE{IncludeShowAuth}%
+%INCLUDE{IncludeFindAuth}%
 
 ---++ Добавить
 

docs/wiki/foswiki/data/DefaultArticleTemplate.txt

@@ -1,3 +1,4 @@
----+!! Загловок %BASETOPIC%
+
+---+!! Заголовок %BASETOPIC%
 
 %TOC%

docs/wiki/foswiki/data/DefaultAuthTemplate.txt

@@ -9,7 +9,7 @@
 
 %META:PREFERENCE{name="PERMSET_VIEW" title="PERMSET_VIEW" type="Local" value="details"}%
 %META:PREFERENCE{name="PERMSET_CHANGE" title="PERMSET_CHANGE" type="Local" value="details"}%
-%META:PREFERENCE{name="ALLOWTOPICVIEW" title="ALLOWTOPICVIEW" type="Set" value="InternetAdminGroup"}%
-%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="InternetAdminGroup"}%
-%META:PREFERENCE{name="PERMSET_VIEW_DETAILS" title="PERMSET_VIEW_DETAILS" type="Local" value="InternetAdminGroup"}%
-%META:PREFERENCE{name="PERMSET_CHANGE_DETAILS" title="PERMSET_CHANGE_DETAILS" type="Local" value="InternetAdminGroup"}%
+%META:PREFERENCE{name="ALLOWTOPICVIEW" title="ALLOWTOPICVIEW" type="Set" value="AdminGroup"}%
+%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%
+%META:PREFERENCE{name="PERMSET_VIEW_DETAILS" title="PERMSET_VIEW_DETAILS" type="Local" value="AdminGroup"}%
+%META:PREFERENCE{name="PERMSET_CHANGE_DETAILS" title="PERMSET_CHANGE_DETAILS" type="Local" value="AdminGroup"}%

docs/wiki/foswiki/data/DefaultBrasTemplate.txt

@@ -0,0 +1,22 @@
+---+!!  %FORMFIELD{"DeviceType" topic="%BASETOPIC%"}%  %FORMFIELD{"DnsName" topic="%BASETOPIC%"}%
+
+%TOC%
+
+---++ Сервер доступа
+
+---++ Маршрутизация
+
+---++ Политика безопасности
+
+%INCLUDE{IncludeHeaderBras}%
+
+-- %WIKIUSERNAME% - %DATE%
+
+%STARTSECTION{type="templateonly"}%
+This topic is needed for normal operation even if System web is restricted.
+   * Set ALLOWTOPICVIEW = *
+%ENDSECTION{type="templateonly"}%
+
+%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%
+%META:PREFERENCE{name="PERMSET_CHANGE" title="PERMSET_CHANGE" type="Local" value="details"}%
+%META:PREFERENCE{name="PERMSET_CHANGE_DETAILS" title="PERMSET_CHANGE_DETAILS" type="Local" value="AdminGroup"}%

docs/wiki/foswiki/data/DefaultBuildingTemplate.txt

@@ -1,6 +1,6 @@
 ---+!! Здание %FORMFIELD{"Description" topic="%BASETOPIC%"}%
 
-%INCLUDE{IncludeBuildingHeader}%
+%INCLUDE{IncludeHeaderBuilding}%
 
 %INCLUDE{IncludeWorkflow}%
 

docs/wiki/foswiki/data/DefaultEsxiTemplate.txt

@@ -1,5 +1,7 @@
 ---+!! Сервер %FORMFIELD{"Name" topic="%BASETOPIC%"}%
 
+%TOC%
+
 %INCLUDE{IncludeShowStat}%
 
 ОС:

docs/wiki/foswiki/data/DefaultGatewayTemplate.txt

@@ -14,7 +14,7 @@
 
 ---++ Политика безопасности
 
-%INCLUDE{IncludeGatewayHeader}%
+%INCLUDE{IncludeHeaderGateway}%
 
 -- %WIKIUSERNAME% - %DATE%
 

docs/wiki/foswiki/data/DefaultHardwareTemplate.txt

@@ -1,6 +1,8 @@
 %META:TOPICINFO{author="roman" comment="reprev" date="1602524519" format="1.1" reprev="2" version="2"}%
 ---++ Сервер %FORMFIELD{"DnsName" topic="%BASETOPIC%"}%
 
+%TOC%
+
 ---+++ Память
 
 | *Type* | *MHz* | *Model* | *Vendor* | *SN* | *Size* |
@@ -17,7 +19,7 @@
 
 | *Name* | *Id* | *mount point* | *Description* |
 
-%INCLUDE{IncludeShowAuth}%
+%INCLUDE{IncludeFindAuth}%
 
 ---++ Добавить
 

docs/wiki/foswiki/data/DefaultKvmHostTemplate.txt

@@ -17,6 +17,6 @@ This topic is needed for normal operation even if System web is restricted.
 
 %META:FORM{name="FormServerOs"}%
 
-%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="InternetAdminGroup"}%
+%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%
 %META:PREFERENCE{name="PERMSET_CHANGE" title="PERMSET_CHANGE" type="Local" value="details"}%
-%META:PREFERENCE{name="PERMSET_CHANGE_DETAILS" title="PERMSET_CHANGE_DETAILS" type="Local" value="InternetAdminGroup"}%
+%META:PREFERENCE{name="PERMSET_CHANGE_DETAILS" title="PERMSET_CHANGE_DETAILS" type="Local" value="AdminGroup"}%

docs/wiki/foswiki/data/DefaultNetdeviceTemplate.txt

@@ -1,10 +1,12 @@
 ---+!!  %FORMFIELD{"DeviceType" topic="%BASETOPIC%"}%  %FORMFIELD{"DnsName" topic="%BASETOPIC%"}%
 
+%TOC%
+
 %INCLUDE{IncludeNetDevCommon}%
 
-%INCLUDE{IncludeShowCerts}%
+%INCLUDE{IncludeFindCerts}%
 
-%INCLUDE{IncludeShowAuth}%
+%INCLUDE{IncludeFindAuth}%
 
 ---++ Добавить
 

docs/wiki/foswiki/data/DefaultPermission.txt

@@ -1,4 +1,3 @@
-
 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%
 %META:PREFERENCE{name="PERMSET_CHANGE" title="PERMSET_CHANGE" type="Local" value="details"}%
 %META:PREFERENCE{name="PERMSET_CHANGE_DETAILS" title="PERMSET_CHANGE_DETAILS" type="Local" value="AdminGroup"}%

docs/wiki/foswiki/data/DefaultPhoneTemplate.txt

@@ -2,7 +2,7 @@
 
 %INCLUDE{IncludeNetDevCommon}%
 
-%INCLUDE{IncludeShowAuth}%
+%INCLUDE{IncludeFindAuth}%
 
 ---++ Добавить
 

docs/wiki/foswiki/data/DefaultPoolTemplate.txt

@@ -1,6 +1,6 @@
 ---++ Dhcp пул для сети %FORMFIELD{"Name" topic="%FORMFIELD{"Subnet" topic="%BASETOPIC%"}%"}%
 
-%INCLUDE{IncludeDhcpPoolHeader}%
+%INCLUDE{IncludeHeaderDhcpPool}%
 
 %INCLUDE{IncludeWorkflow}%
 

docs/wiki/foswiki/data/DefaultRackTemplate.txt

@@ -1,6 +1,6 @@
 ---+!! Стойка %FORMFIELD{"Name" topic="%BASETOPIC%"}%
 
-%INCLUDE{IncludeRackHeader}%
+%INCLUDE{IncludeHeaderRack}%
 
 %INCLUDE{IncludeWorkflow}%
 

docs/wiki/foswiki/data/DefaultRoomTemplate.txt

@@ -2,7 +2,7 @@
 
 ---+!! Комната %FORMFIELD{"Name" topic="%BASETOPIC%"}% (%FORMFIELD{"Description" topic="%BASETOPIC%"}%)
 
-%INCLUDE{IncludeRoomHeader}%
+%INCLUDE{IncludeHeaderRoom}%
 
 %INCLUDE{IncludeWorkflow}%
 

docs/wiki/foswiki/data/DefaultRouterTemplate.txt

@@ -10,7 +10,7 @@
 
 ---++ Политика безопасности
 
-%INCLUDE{IncludeRouterHeader}%
+%INCLUDE{IncludeHeaderRouter}%
 
 -- %WIKIUSERNAME% - %DATE%
 

docs/wiki/foswiki/data/DefaultServerTemplate.txt

@@ -1,3 +1,5 @@
+%TOC%
+
 ---+!! Сервер %FORMFIELD{"DnsName" topic="%BASETOPIC%"}%
 
 ОС:
@@ -6,7 +8,7 @@
 
 ---++ Сеть
 
-%INCLUDE{IncludeServerHeader}%
+%INCLUDE{IncludeHeaderServer}%
 
 -- %WIKIUSERNAME% - %DATE%
 

docs/wiki/foswiki/data/DefaultServiceTemplate.txt

@@ -1,6 +1,6 @@
 ---+!! Сервис %FORMFIELD{"Description" topic="%BASETOPIC%"}%
 
-%INCLUDE{IncludeShowAuth}%
+%INCLUDE{IncludeFindAuth}%
 
 %INCLUDE{IncludeAddAuth}%
 %INCLUDE{IncludeAddAcl}%

docs/wiki/foswiki/data/DefaultSiteTemplate.txt

@@ -1,6 +1,6 @@
 ---+!! Сайт %FORMFIELD{"Httpproto" topic="%BASETOPIC%"}%://%FORMFIELD{"DnsName" topic="%BASETOPIC%"}%
 
-%INCLUDE{IncludeShowAuth}%
+%INCLUDE{IncludeFindAuth}%
 
 %INCLUDE{IncludeAddAuth}%
 %INCLUDE{IncludeAddAcl}%

docs/wiki/foswiki/data/DefaultSubnetTemplate.txt

@@ -1,6 +1,6 @@
 ---+ Network: %FORMFIELD{"Name" topic="%BASETOPIC%"}%
 
-%INCLUDE{IncludeSubnetHeader}%
+%INCLUDE{IncludeHeaderSubnet}%
 
 %INCLUDE{IncludeWorkflow}%
 

docs/wiki/foswiki/data/DefaultSwitchTemplate.txt

@@ -1,8 +1,10 @@
 ---+!!  %FORMFIELD{"DeviceType" topic="%BASETOPIC%"}%  %FORMFIELD{"DnsName" topic="%BASETOPIC%"}%  (%FORMFIELD{"Description" topic="%BASETOPIC%"}%)
 
-%INCLUDE{IncludeSwitchHeader}%
+%TOC%
 
-%INCLUDE{IncludeShowAuth}%
+%INCLUDE{IncludeHeaderSwitch}%
+
+%INCLUDE{IncludeFindAuth}%
 
 %INCLUDE{IncludeAddAuth}%
 %INCLUDE{IncludeAddAcl}%

docs/wiki/foswiki/data/DefaultUpsTemplate.txt

@@ -1,8 +1,8 @@
 ---+!!  %FORMFIELD{"DeviceType" topic="%BASETOPIC%"}%  %FORMFIELD{"DnsName" topic="%BASETOPIC%"}%
 
-%INCLUDE{IncludeUpsHeader}%
+%INCLUDE{IncludeHeaderUps}%
 
-%INCLUDE{IncludeShowAuth}%
+%INCLUDE{IncludeFindAuth}%
 
 %INCLUDE{IncludeAddAuth}%
 %INCLUDE{IncludeAddAcl}%

docs/wiki/foswiki/data/DefaultVideoRegTemplate.txt

@@ -1,10 +1,12 @@
 ---+!!  %FORMFIELD{"DeviceType" topic="%BASETOPIC%"}%  %FORMFIELD{"DnsName" topic="%BASETOPIC%"}%
 
-%INCLUDE{IncludeCamList}%
+%TOC%
+
+%INCLUDE{IncludeFindCamList}%
 
 %INCLUDE{IncludeNetDevCommon}%
 
-%INCLUDE{IncludeShowAuth}%
+%INCLUDE{IncludeFindAuth}%
 
 ---++ Добавить
 

docs/wiki/foswiki/data/DefaultVirtualHostTemplate.txt

@@ -1,5 +1,9 @@
 ---+!! Виртуальная машина %FORMFIELD{"DnsName" topic="%BASETOPIC%"}% на %FORMFIELD{"Name" topic="%FORMFIELD{"ParentHost" topic="%BASETOPIC%"}%"}%
 
+%TOC%
+
+---++ Описание
+
 ОС:
 
 ---++ Дисковая подсистема

docs/wiki/foswiki/data/DefaultVoipGateTemplate.txt

@@ -1,10 +1,10 @@
 ---+!!  %FORMFIELD{"DeviceType" topic="%BASETOPIC%"}%  %FORMFIELD{"DnsName" topic="%BASETOPIC%"}%
 
-%INCLUDE{IncludePhoneList}%
+%INCLUDE{IncludeFindPhoneList}%
 
 %INCLUDE{IncludeNetDevCommon}%
 
-%INCLUDE{IncludeShowAuth}%
+%INCLUDE{IncludeFindAuth}%
 
 ---++ Добавить
 

docs/wiki/foswiki/data/DefaultWirelessProfileTemplate.txt

@@ -1,6 +1,6 @@
 ---+ Wireless SSID: %FORMFIELD{"WirelessSSID" topic="%BASETOPIC%"}%
 
-%INCLUDE{IncludeWPapList}%
+%INCLUDE{IncludeFindWPapList}%
 
 ---++ Добавить
 

docs/wiki/foswiki/data/DefaultWlcTemplate.txt

@@ -36,7 +36,7 @@ $(function() {
 });
 </script>
 
-%INCLUDE{IncludeNetDevHeader}%
+%INCLUDE{IncludeHeaderNetDev}%
 
 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%
 %META:PREFERENCE{name="PERMSET_CHANGE" title="PERMSET_CHANGE" type="Local" value="details"}%

docs/wiki/foswiki/data/FaqCeph.txt

@@ -1,90 +0,0 @@
-%META:TOPICINFO{author="roman" comment="reprev" date="1627895777" format="1.1" reprev="1" version="1"}%
-%META:TOPICPARENT{name="ListOfFaq"}%
----+!! Работа с Ceph
-
-%TOC%
-
----++ Общие команды Ceph
-
-   * Просмотр информации о соостоянии кластера: ceph health, ceph health detail, ceph -w, я использую: watch -n 5 ceph -s)
-   * Свободное место в кластере по пулам: ceph df
-   * Список пулов: rados lspools
-   * Посмотреть список имэджей со снапшотами: rbd --pool ПУЛ ls -l (работает только с rbd пулами one и hdd-pool)
-   * Экспортировать имэдж: rbd export --export-format qcow2 -p ПУЛ ИМЯИМЭДЖА ПУТЬСИМЕНЕМФАЙЛА
-   * Прибиндить имэдж к /dev/rbd и работать как с блочным устройством: rbd map ПУЛ/ИМЭДЖ (rbd map one/one-204)
-   * Отбиндить:  rbd unmap /dev/rbd0 
-
-%RED%Работать с имэджами только если они не используются или монтировать на RO, иначе ФС на нем побьётся.%ENDCOLOR%
-
----++ Работа с OSD
-
----+++ Для просмотра статуса всех osd
-ceph osd tree
-
----+++ Для просмотра свободного места на них
-ceph osd df
-
----+++ Если проводится запланированная замена OSD 
-то, чтобы избежать ненужного ребаланса, надо сделать: ceph osd set noout
-
----+++ Для удаления osd
-запускаем скрипт 'rm-osd.sh НОМЕРOSD' на соответствующем сервере. 
-Скрипт полуавтоматический, будет спрашивать о каждом действии. 
-Перед удалением osd желательно знать имя диска для проверки то ли удаляем.
-
----+++ Для добавления osd
-заходим на fog.
-
-cd /etc/ceph
-
-ceph-deploy --overwrite-conf osd create ИМЯСЕРВЕРА --data ИМЯДИСКА
-
-иногда неправильно определяется типа osd (hdd вместо ssd). Для этого надо сделать
-
-ceph osd crush rm-device-class НОМЕРОСД
-
-ceph osd crush set-device-class ssd НОМЕРОСД
-
----+++ Вывести OSD из кластера
-
-ceph osd НОМЕР out
-
-Никогда не пытаться выводить несоклько OSD за раз. Будет очень-очень-очень долгий ребилд и если в процессе что-то екнутся, может случится что-то нехорошее. Ну вобщем поступать как с большим рейдом. 
-
----++ Влить большой имэдж через опеннебулу в ceph
-
-Иногда нужно влить большой имэдж через опеннебулу в ceph.
-Но через web это адское занятие, поэтому делается все иначе:
-
-   1 Создаем в opennebula пустой имэдж в нужном пуле (SSD -> one,HDD-> hdd-pool, ($POOL)) и записываем id ($ID).
-   2 Идем на любой сервер с ceph (я юзаю fog) 
-   3 Скачиваем толстый имэдж ($FILE)
-   4 Ищем созданный opennebula пустой имэдж через: rbd ls -l --pool $POOL | grep one-$ID
-   5 Если с id и размером все ок, то делаем: rbd rm $POOL/one-$ID
-   6 Делаем rbd import $FILE $POOL/one-$ID
-
----++ Блочные бэкапы Ceph RBD делаются с помощью backy2 на сервере fog (192.168.13.98)
-
-/usr/local/scripts/backy/backup-total.sh
-   1 генерация списка rbd устройств через Opennebula API
-   2 Создание инкрементальных бэкапов
-   3 Очистка старых бэкапов
-
-Там же есть скрипт scrub.sh, который проверяет целостность бэкапов.
-
-Бэкапы делаются каждую ночь.
-
-При добавлении толстого или ненужного для бэкапа имэджа, его id надо указать в /usr/local/scripts/backy/sub/regen_backup.pl - %skipdisk
-
-Если более прямые варианты (фильтрация по меткам, имени имэджа), но это без надобности, так как редко происходит.
-
----++ Links
-
-   * Заметки о Ceph - https://ceph-docs.readthedocs.io/ru/latest/
-   * Ceph Benchmark - https://access.redhat.com/documentation/en-us/red_hat_ceph_storage/1.3/html/administration_guide/benchmarking_performance
-   * Mastering Ceph (rus) - https://access.redhat.com/documentation/en-us/red_hat_ceph_storage/1.3/html/administration_guide/benchmarking_performance
-   * Ceph performance - https://yourcmc.ru/wiki/index.php?title=Ceph_performance&mobileaction=toggle_view_desktop#General_benchmarking_principles
-   * Ceph performance analyze - http://telekomcloud.github.io/ceph/2014/02/26/ceph-performance-analysis_fio_rbd.html
-   * Ceph PGs - https://docs.ceph.com/en/latest/rados/operations/placement-groups/?
-   * Nagios - https://nagios.sovtest.ru/cgi-bin//status.cgi?hostgroup=Cloud&style=detail&limit=0&limit=0
-   * Ceph-deploy (не обновляется) - https://github.com/ceph/ceph-deploy

docs/wiki/foswiki/data/IncludeAddAP.txt

@@ -4,7 +4,7 @@
      <input type="hidden" name="templatetopic" value="DefaultNetdeviceTemplate" />
      <input type="hidden" name="onlywikiname" value="off" />
      <input type="hidden" name="topicparent" value="%BASETOPIC%" />
-     <input type="hidden" name="formtemplate" value="FormNetDevice" />
-     <input type="hidden" name="DeviceType" value="4Gmodem" />
+     <input type="hidden" name="formtemplate" value="FormAP" />
+     <input type="hidden" name="DeviceType" value="AP" />
      <input type="submit" value="Create" />
 </form>

docs/wiki/foswiki/data/IncludeAddService.txt

@@ -4,6 +4,7 @@
      <input type="hidden" name="templatetopic" value="DefaultServiceTemplate" />
      <input type="hidden" name="onlywikiname" value="off" />
      <input type="hidden" name="topicparent" value="%BASETOPIC%" />
+     <input type="hidden" name="Parent" value="%BASETOPIC%" />
      <input type="hidden" name="formtemplate" value="FormService" />
      <input type="submit" value="Create" />
 </form>

docs/wiki/foswiki/data/IncludeFindClav.txt

@@ -0,0 +1,11 @@
+---++ Список офисов/комнат/серверных
+
+%SEARCH{
+"Parent='%BASETOPIC%'"
+topic="Room*,Clav*"
+type="query"
+nosearch="on"
+nototal="on"
+header="|*Клозет*|*Description*|"
+format="| [[$topic][$formfield(Name)]] | $formfield(Description) |"
+}%

docs/wiki/foswiki/data/IncludeFindRooms.txt

@@ -6,6 +6,6 @@ topic="Room*"
 type="query"
 nosearch="on"
 nototal="on"
-header="|*Клозет*|*Description*|"
+header="|*Кабинет*|*Description*|"
 format="| [[$topic][$formfield(Name)]] | $formfield(Description) |"
 }%

docs/wiki/foswiki/data/IncludeSelectATS.txt

@@ -1 +1 @@
-, %SEARCH{"\.*" scope="topic" topic="DeviceATS*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="topic"}%
+, %SEARCH{"\.*" scope="topic" topic="DeviceATS*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}%

docs/wiki/foswiki/data/IncludeSelectBuilding.txt

@@ -1 +1 @@
-, %SEARCH{"\.*" web="Sovtest" scope="topic" topic="Building*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$web.$topic" separator=", " order="$web.$topic"}%
+, %SEARCH{"\.*" scope="topic" topic="Building*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}%

docs/wiki/foswiki/data/IncludeSelectCluster.txt

@@ -1 +1 @@
-, %SEARCH{"\.*" web="Sovtest" scope="topic" topic="Cluster*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$web.$topic" separator=", " order="formfield(Name)"}%
+, %SEARCH{"\.*" scope="topic" topic="Cluster*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}%

docs/wiki/foswiki/data/IncludeSelectClusterHardware.txt

@@ -1 +1 @@
-, %SEARCH{"\.*" scope="topic" topic="Sovtest.Cluster*,Hardware*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$web.$topic" separator=", " order="formfield(Name)"}%
+, %SEARCH{"\.*" scope="topic" topic="Cluster*,Hardware*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}%

docs/wiki/foswiki/data/IncludeSelectDeviceParent.txt

@@ -1 +1 @@
- , %SEARCH{"\.*" scope="topic" topic="Server*,Router*,Switch*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="topic"}% 
+ , %SEARCH{"\.*" scope="topic" topic="Server*,Router*,Switch*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}% 

docs/wiki/foswiki/data/IncludeSelectDeviceType.txt

@@ -1,8 +1,7 @@
-4Gmodem,
 AP,
 ATS,
+AirConditioning,
 Computer,
-CoreRouter,
 CPO,
 Gateway,
 Hardware,

docs/wiki/foswiki/data/IncludeSelectDhcpPool.txt

@@ -1 +1 @@
-, %SEARCH{"\.*" scope="topic" topic="DhcpPool*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="topic"}%
+, %SEARCH{"\.*" scope="topic" topic="DhcpPool*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}%

docs/wiki/foswiki/data/IncludeSelectDnsZone.txt

@@ -1 +1 @@
-, %SEARCH{"\.*" scope="topic" topic="Dns*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="topic"}%
+, %SEARCH{"\.*" scope="topic" topic="Dns*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}%

docs/wiki/foswiki/data/IncludeSelectDomain.txt

@@ -1 +1 @@
- , %SEARCH{search="\.*" scope="topic" topic="Domain*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="topic"}%
+ , %SEARCH{search="\.*" scope="topic" topic="Domain*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}%

docs/wiki/foswiki/data/IncludeSelectHardware.txt

@@ -1 +1 @@
-, %SEARCH{"\.*" scope="topic" topic="Hardware*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="topic"}%
+, %SEARCH{"\.*" scope="topic" topic="Hardware*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}%

docs/wiki/foswiki/data/IncludeSelectKvmHostParent.txt

@@ -3,20 +3,19 @@
 type="query"
 nosearch="on"
 nototal="on"
-format="$web.$topic"
+format="$topic"
 separator=", "
 order="formfield(Name)"
 }%
 , %SEARCH{
 "\.*"
 scope="topic"
-web="Sovtest"
 topic="Cluster*"
 nototal="on"
 nosummary="on"
 nosearch="on"
 regex="on"
-format="$web.$topic"
+format="$topic"
 separator=", "
 order="formfield(Name)"
-}%
+}%

docs/wiki/foswiki/data/IncludeSelectNetHost.txt

@@ -1 +1 @@
-, %SEARCH{"\.*" scope="topic" topic="Ups*,Device*,Switch*,Router*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="topic"}%
+, %SEARCH{"\.*" scope="topic" topic="Ups*,Device*,Switch*,Router*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}%

docs/wiki/foswiki/data/IncludeSelectNetParent.txt

@@ -1 +1 @@
-, %SEARCH{"\.*" scope="topic" topic="Switch*,Router*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="topic"}%
+, %SEARCH{"\.*" scope="topic" topic="Switch*,Router*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}%

docs/wiki/foswiki/data/IncludeSelectPlace.txt

@@ -1 +1 @@
-, %SEARCH{"\.*" web="Sovtest" scope="topic" topic="Building*,Room*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$web.$topic" separator=", " order="$web.$topic"}%
+, %SEARCH{"\.*" scope="topic" topic="Building*,Room*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Parent)"}%

docs/wiki/foswiki/data/IncludeSelectRack.txt

@@ -1 +1 @@
-, %SEARCH{scope="topic" web="Sovtest" topic="Rack*" nototal="on" nosummary="on" nosearch="on" type="query" format="$web.$topic" separator=", " order="formfield(Parent)"}%
+, %SEARCH{scope="topic" topic="Rack*" nototal="on" nosummary="on" nosearch="on" type="query" format="$topic" separator=", " order="formfield(Parent)"}%

docs/wiki/foswiki/data/IncludeSelectRoom.txt

@@ -1 +1 @@
-, %SEARCH{scope="topic" web="Sovtest" topic="Room*" nototal="on" nosummary="on" nosearch="on" type="query" format="$web.$topic" separator=", " order="formfield(Parent)"}%
+, %SEARCH{scope="topic" topic="Room*" nototal="on" nosummary="on" nosearch="on" type="query" format="$topic" separator=", " order="formfield(Parent)"}%

docs/wiki/foswiki/data/IncludeSelectServer.txt

@@ -1 +1 @@
-, %SEARCH{"\.*" scope="topic" topic="Vmware*,Server*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="topic"}%
+, %SEARCH{"\.*" scope="topic" topic="Vmware*,Server*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}%

docs/wiki/foswiki/data/IncludeSelectServiceType.txt

@@ -19,6 +19,7 @@ Kannel,
 Keepalived,
 Ldap,
 MongoDB,
+Monit,
 MySQL,
 Nagios,
 Nfcapd,

docs/wiki/foswiki/data/IncludeSelectVoipGate.txt

@@ -1 +1 @@
-, %SEARCH{"\.*" scope="topic" topic="DeviceVoipGate*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="topic"}%
+, %SEARCH{"\.*" scope="topic" topic="DeviceVoipGate*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}%

docs/wiki/foswiki/data/ListOfArticles.txt

@@ -22,6 +22,6 @@ header="Найдено:<br>" format="* [[$web.$topic][$pattern(.*\-\-\-\+\!\! (.
 %META:PREFERENCE{name="DENYTOPICCHANGE" title="DENYTOPICCHANGE" type="Set" value="WikiGuest"}%
 %META:PREFERENCE{name="PERMSET_VIEW" title="PERMSET_VIEW" type="Local" value="registeredusers"}%
 %META:PREFERENCE{name="PERMSET_CHANGE" title="PERMSET_CHANGE" type="Local" value="registeredusers"}%
-%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="InternetAdminGroup"}%
+%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%
 %META:PREFERENCE{name="PERMSET_CHANGE" title="PERMSET_CHANGE" type="Local" value="details"}%
-%META:PREFERENCE{name="PERMSET_CHANGE_DETAILS" title="PERMSET_CHANGE_DETAILS" type="Local" value="InternetAdminGroup"}%
+%META:PREFERENCE{name="PERMSET_CHANGE_DETAILS" title="PERMSET_CHANGE_DETAILS" type="Local" value="AdminGroup"}%

docs/wiki/foswiki/data/ListOfHardware.txt

@@ -34,6 +34,6 @@ format="| [[$topic][$formfield(Name)]] | $formfield(FormFactor) | $formfield(Man
 -- Main.RomanDmitriev - 2020/10/11
 
 %META:TOPICMOVED{by="roman" date="1624971526" from="Sovtest.ListServersInternet" to="Sovtest.ListOfServersInternet"}%
-%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="InternetAdminGroup"}%
+%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%
 %META:PREFERENCE{name="PERMSET_CHANGE" title="PERMSET_CHANGE" type="Local" value="details"}%
-%META:PREFERENCE{name="PERMSET_CHANGE_DETAILS" title="PERMSET_CHANGE_DETAILS" type="Local" value="InternetAdminGroup"}%
+%META:PREFERENCE{name="PERMSET_CHANGE_DETAILS" title="PERMSET_CHANGE_DETAILS" type="Local" value="AdminGroup"}%

docs/wiki/foswiki/data/NetworkSovtest.txt

@@ -38,7 +38,6 @@
 
 -- Main.RomanDmitriev - 2020/10/10
 
-%META:FILEATTACHMENT{name="Жуково.dia" attachment="Жуково.dia" attr="" comment="Схема сети в Жуково по состоянию на 15.05.2020" date="1613583008" path="Жуково.dia" size="6668" user="roman" version="1"}%
 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%
 %META:PREFERENCE{name="PERMSET_CHANGE" title="PERMSET_CHANGE" type="Local" value="details"}%
 %META:PREFERENCE{name="PERMSET_CHANGE_DETAILS" title="PERMSET_CHANGE_DETAILS" type="Local" value="AdminGroup"}%

updates/20210809/mysql-wikiweb.sql

@@ -0,0 +1,2 @@
+INSERT INTO `config_options` (`id`, `option_name`, `description`, `uniq`, `type`, `default_value`, `min_value`, `max_value`) VALUES
+(63, 'wiki_web', 'Web for Wiki. Default - Main. http://example.local/Main/WebHome', 1, 'text', 'Main', 0, 0);