Browse Source

remove illegal link to web

rajven 4 years ago
parent
commit
e084455cc4

+ 0 - 49
docs/wiki/foswiki/data/ClusterOpenNebula.txt

@@ -1,49 +0,0 @@
-%META:TOPICINFO{author="roman" comment="reprev" date="1627890919" format="1.1" reprev="10" version="10"}%
----+!! Кластер для офисного облака на OpenNebula
-
-%TOC%
-
----++ Список Host-серверов в кластере %BASETOPIC%
-
-%SEARCH{
-"lc(DeviceType)='kvmhost' and VirtualCluster='%BASETOPIC%'"
-topic="Server*"
-type="query"
-nosearch="on"
-header="|*Name*|*CPU*|*Memory*|*IP*|*Description*|*Rack*|"
-format="| [[$topic][$formfield(DnsName)]] | $formfield(DeviceCPU) | $formfield(DeviceMemory) | $formfield(DeviceIP) | $formfield(Description) | $formfield(Rack) |"
-}%
-
----++ Виртуальные сервера в облаке.
-
-%SEARCH{
-"lc(DeviceType)~'virtual*' and VirtualCluster!=''"
-topic="Server*"
-type="query"
-nosearch="on"
-header="|*ID*|*Name*|*Virtualization*|*CPU Count*|*Memory*|*OS*|*IP*|*Description*|"
-format="| $formfield(VmID) | [[$web.$topic][$formfield(DnsName)]] | $formfield(Device Type) | $formfield(Device CPU) | $formfield(Device Memory) | $formfield(Device OS) | $formfield(Device IP) | $formfield(Description) |"
-}%
-
----++ Добавить
-
-%INCLUDE{IncludeAddVServerCluster}%
-
-%INCLUDE{IncludeAddKvmHost}%
-
----++ Работа
-
-%COMMENT{type="workflow"}%
-
--- Main.RomanDmitriev - 2020/10/14
-
-%META:FORM{name="FormSimple"}%
-%META:FIELD{name="Name" title="Name" value="ClusterOpenNebula"}%
-%META:FIELD{name="Place" title="Place" value=""}%
-%META:FIELD{name="Rack" title="Rack" value=""}%
-%META:FIELD{name="Unit" title="Unit" value=""}%
-%META:FIELD{name="Description" title="Description" value="Офисное облако"}%
-%META:PREFERENCE{name="DENYTOPICVIEW" title="DENYTOPICVIEW" type="Set" value="WikiGuest"}%
-%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"}%

+ 0 - 1
docs/wiki/foswiki/data/DefaultSiteTemplate.txt

@@ -7,7 +7,6 @@
 -- %WIKIUSERNAME% - %DATE%
 
 %META:FORM{name="FormSite"}%
-%META:TOPICMOVED{by="roman" date="1602526634" from="Sovtest.SiteTemplate" to="Sovtest.DefaultSiteTemplate"}%
 
 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%
 %META:PREFERENCE{name="PERMSET_CHANGE" title="PERMSET_CHANGE" type="Local" value="details"}%

+ 1 - 1
docs/wiki/foswiki/data/DefaultVirtCluster.txt

@@ -22,7 +22,7 @@ topic="Server*"
 type="query"
 nosearch="on"
 header="|*ID*|*Name*|*Virtualization*|*CPU Count*|*Memory*|*OS*|*IP*|*Description*|"
-format="| $formfield(VmID) | [[$web.$topic][$formfield(DnsName)]] | $formfield(Device Type) | $formfield(Device CPU) | $formfield(Device Memory) | $formfield(Device OS) | $formfield(Device IP) | $formfield(Description) |"
+format="| $formfield(VmID) | [[$topic][$formfield(DnsName)]] | $formfield(Device Type) | $formfield(Device CPU) | $formfield(Device Memory) | $formfield(Device OS) | $formfield(Device IP) | $formfield(Description) |"
 }%
 
 ---++ Добавить

+ 2 - 4
docs/wiki/foswiki/data/IncludeFindAuth.txt

@@ -2,24 +2,22 @@
 
 %SEARCH{
 "parent.name='%BASETOPIC%' OR parent.name='%WEB%.%BASETOPIC%'"
-web="%WEB%"
 topic="Auth*"
 type="query"
 nosearch="on"
 nototal="on"
 header="Найдено:<br>"
-format="* [[$web.$topic][$pattern(.*\-\-\-\+\!\!\s*(.*?)[\r\n].*)]] <br>"
+format="* [[$topic][$pattern(.*\-\-\-\+\!\!\s*(.*?)[\r\n].*)]] <br>"
 }%
 
 ---++ Списки доступа
 
 %SEARCH{
 "parent.name='%BASETOPIC%' OR parent.name='%WEB%.%BASETOPIC%'"
-web="%WEB%"
 topic="Acl*"
 type="query"
 nosearch="on"
 nototal="on"
 header="Найдено:<br>"
-format="* [[$web.$topic][$pattern(.*\-\-\-\+\!\!\s*(.*?)[\r\n].*)]] <br>"
+format="* [[$topic][$pattern(.*\-\-\-\+\!\!\s*(.*?)[\r\n].*)]] <br>"
 }%

+ 1 - 2
docs/wiki/foswiki/data/IncludeFindAuthAll.txt

@@ -2,10 +2,9 @@
 
 %SEARCH{
 "^---++\s*.*\n"
-web="%WEB%"
 type="regex"
 topic="Auth*"
 nonoise="on"
 multi="off"
-header="Найдено:<br>" format="* [[$web.$topic][$pattern(.*\-\-\-\+\!\!\s*(.*?)[\r\n].*)]] <br>"
+header="Найдено:<br>" format="* [[$topic][$pattern(.*\-\-\-\+\!\!\s*(.*?)[\r\n].*)]] <br>"
 }%

+ 1 - 2
docs/wiki/foswiki/data/IncludeFindBuildingDevices.txt

@@ -4,11 +4,10 @@
 "(Place='%BASETOPIC%' or Parent='%BASETOPIC%') and not Rack"
 topic="*"
 excludetopic="Rack*,Room*,Building*"
-web="Sovtest,Internet"
 type="query"
 nosearch="on"
 nototal="on"
 header="|*Name*|*Место*|*Model*|*Description*|"
-format="| [[$web.$topic][$formfield(Name)]] | $formfield(Rack) | $formfield(Vendor) $formfield(DeviceModel) | $formfield(Description) |"
+format="| [[$topic][$formfield(Name)]] | $formfield(Rack) | $formfield(Vendor) $formfield(DeviceModel) | $formfield(Description) |"
 order="formfield(Name)"
 }%

+ 0 - 1
docs/wiki/foswiki/data/IncludeFindCerts.txt

@@ -2,7 +2,6 @@
 
 %SEARCH{
 "parent.name='%BASETOPIC%' OR parent.name='%WEB%.%BASETOPIC%'"
-web="%WEB%"
 type="query"
 topic="Cert*"
 nosearch="on"

+ 1 - 2
docs/wiki/foswiki/data/IncludeFindRackDevices.txt

@@ -3,13 +3,12 @@
 %SEARCH{
 "Rack='%BASETOPIC%' or Parent='%BASETOPIC%' or Place='%BASETOPIC%'"
 topic="*"
-web="Sovtest,Internet"
 excludetopic="Rack*"
 type="query"
 nosearch="on"
 nototal="on"
 expandvariables="on"
 header="|*Name*|*Тип*|*Description*|"
-format="| [[$web.$topic][$formfield(DnsName)]] | $formfield(DeviceType) | $formfield(Description) |"
+format="| [[$topic][$formfield(DnsName)]] | $formfield(DeviceType) | $formfield(Description) |"
 order="formfield(Name)"
 }%

+ 1 - 2
docs/wiki/foswiki/data/IncludeFindRoomDevices.txt

@@ -4,11 +4,10 @@
 "(Place='%BASETOPIC%' or Parent='%BASETOPIC%') and not Rack"
 topic="*"
 excludetopic="Rack*"
-web="Sovtest,Internet"
 type="query"
 nosearch="on"
 nototal="on"
 header="|*Name*|*Место*|*Model*|*Description*|"
-format="| [[$web.$topic][$formfield(Name)]] | $formfield(Rack) | $formfield(Vendor) $formfield(DeviceModel) | $formfield(Description) |"
+format="| [[$topic][$formfield(Name)]] | $formfield(Rack) | $formfield(Vendor) $formfield(DeviceModel) | $formfield(Description) |"
 order="formfield(Name)"
 }%

+ 1 - 2
docs/wiki/foswiki/data/IncludeHeaderSubnet.txt

@@ -3,14 +3,13 @@
 %SEARCH{
 "DeviceSubnet='%BASETOPIC%'"
 type="query"
-web="Sovtest,Internet"
 nosearch="on"
 nototal="on"
 pager="on"
 pagesize="25"
 order="formfield(DnsName)"
 header="|*IP   * | *Host* | *Description* |"
-format="| $formfield(DeviceIP) | [[$web.$topic][$formfield(DnsName)]] | $formfield(Description) |"
+format="| $formfield(DeviceIP) | [[$topic][$formfield(DnsName)]] | $formfield(Description) |"
 }%
 
 ---++ Параметры сети %FORMFIELD{"Subnet" topic="%BASETOPIC%"}%

+ 0 - 1
docs/wiki/foswiki/data/ListGatewaysSovtestLocal.txt

@@ -38,7 +38,6 @@ format="| [[$topic][$formfield(DnsName)]] | $formfield(Vendor) $formfield(Device
 
 -- Main.RomanDmitriev - 2020/10/10
 
-%META:TOPICMOVED{by="roman" date="1602510247" from="Sovtest.GatewaysOneLocal" to="One.ListGatewaysJmtcLocal"}%
 %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"}%

+ 0 - 1
docs/wiki/foswiki/data/ListOfAPSovtestLocal.txt

@@ -45,7 +45,6 @@ format="| [[$topic][$formfield(Name)]] | $formfield(Vendor) $formfield(DeviceMod
 -- Main.RomanDmitriev - 07 Nov 2020
 
 
-%META:TOPICMOVED{by="roman" date="1604778241" from="Sovtest.DeviceAPOneLocal" to="One.ListOfAPJmtcLocal"}%
 %META:PREFERENCE{name="DENYTOPICVIEW" title="DENYTOPICVIEW" type="Set" value="WikiGuest"}%
 %META:PREFERENCE{name="DENYTOPICCHANGE" title="DENYTOPICCHANGE" type="Set" value="WikiGuest"}%
 %META:PREFERENCE{name="PERMSET_VIEW" title="PERMSET_VIEW" type="Local" value="registeredusers"}%

+ 1 - 2
docs/wiki/foswiki/data/ListOfArticles.txt

@@ -7,7 +7,7 @@
 type="regex"
 topic="Article*"
 nosearch="on"
-header="Найдено:<br>" format="* [[$web.$topic][$pattern(.*\-\-\-\+\!\! (.*?)[\r\n].*)]] <br>"
+header="Найдено:<br>" format="* [[$topic][$pattern(.*\-\-\-\+\!\! (.*?)[\r\n].*)]] <br>"
 }%
 
 ---++ Добавить
@@ -17,7 +17,6 @@ header="Найдено:<br>" format="* [[$web.$topic][$pattern(.*\-\-\-\+\!\! (.
 -- Main.RomanDmitriev - 07 Nov 2020
 
 
-%META:TOPICMOVED{by="roman" date="1604778241" from="Sovtest.DeviceAPInternet" to="One.ListOfAPJmtcLocal"}%
 %META:PREFERENCE{name="DENYTOPICVIEW" title="DENYTOPICVIEW" type="Set" value="WikiGuest"}%
 %META:PREFERENCE{name="DENYTOPICCHANGE" title="DENYTOPICCHANGE" type="Set" value="WikiGuest"}%
 %META:PREFERENCE{name="PERMSET_VIEW" title="PERMSET_VIEW" type="Local" value="registeredusers"}%

+ 0 - 1
docs/wiki/foswiki/data/ListOfBackupSovtestLocal.txt

@@ -23,7 +23,6 @@ format="* [[$topic][$pattern([\r\n\-+!]+([^\r\n]*?)[\r\n].*)]] <br>"
 
 -- Main.RomanDmitriev - 19 Oct 2020
 
-%META:TOPICMOVED{by="roman" date="1603098749" from="Sovtest.BackupCommonOneLocal" to="One.ListOfBackupJmtcLocal"}%
 %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"}%

+ 1 - 1
docs/wiki/foswiki/data/ListOfCert.txt

@@ -7,7 +7,7 @@ type="query"
 nosearch="on"
 nototal="on"
 header="|*Cert Name*|*Alt Names*|*Valid*|*Type*|*Vendor*|*Parent*|"
-format="| [[$web.$topic][$formfield(DnsName)]] | $formfield(Cert Alt names) | $formfield(Cert Valid To) | $formfield(CertType) | $formfield(Cert Vendor) | $parent |"
+format="| [[$topic][$formfield(DnsName)]] | $formfield(Cert Alt names) | $formfield(Cert Valid To) | $formfield(CertType) | $formfield(Cert Vendor) | $parent |"
 }%
 
 ---++ Работа

+ 0 - 1
docs/wiki/foswiki/data/ListOfDnsServers.txt

@@ -28,7 +28,6 @@ format="| [[$topic][$formfield(DnsZoneName)]] | $formfield(Description) |"
 
 -- Main.RomanDmitriev - 2020/10/12
 
-%META:TOPICMOVED{by="roman" date="1602761344" from="Sovtest.DnsServers" to="One.ListOfDnsServers"}%
 %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"}%

+ 0 - 1
docs/wiki/foswiki/data/ListOfDomains.txt

@@ -28,6 +28,5 @@ format="| [[$topic][$formfield(DnsZoneName)]] | $formfield(DomainName) | $formfi
 
 -- Main.RomanDmitriev - 2020/10/11
 
-%META:TOPICMOVED{by="roman" date="1602673051" from="Hosting.DomainList" to="Hosting.ListOfDomains"}%
 %META:PREFERENCE{name="DENYTOPICVIEW" title="DENYTOPICVIEW" type="Set" value="WikiGuest"}%
 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%

+ 0 - 1
docs/wiki/foswiki/data/ListOfEquipmentHdd.txt

@@ -12,7 +12,6 @@
 
 -- 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="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"}%

+ 1 - 1
docs/wiki/foswiki/data/ListOfFaq.txt

@@ -8,7 +8,7 @@
 type="regex"
 topic="Faq*"
 nosearch="on"
-header="Найдено:<br>" format="* [[$web.$topic][$pattern(.*\-\-\-\+\!\! (.*?)[\r\n].*)]] <br>"
+header="Найдено:<br>" format="* [[$topic][$pattern(.*\-\-\-\+\!\! (.*?)[\r\n].*)]] <br>"
 }%
 
 ---++ Добавить

+ 0 - 1
docs/wiki/foswiki/data/ListOfHardware.txt

@@ -33,7 +33,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="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"}%

+ 0 - 1
docs/wiki/foswiki/data/ListOfServers.txt

@@ -10,7 +10,6 @@
 
 -- Main.RomanDmitriev - 2020/10/11
 
-%META:TOPICMOVED{by="roman" date="1624971526" from="Sovtest.ListServersSovtestLocal" to="Sovtest.ListOfServersOneLocal"}%
 %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"}%

+ 0 - 1
docs/wiki/foswiki/data/ListOfServersOneLocal.txt

@@ -16,7 +16,6 @@ format="| [[$topic][$formfield(DnsName)]]| $formfield(DeviceOS) | $formfield(Dev
 
 -- Main.RomanDmitriev - 2020/10/11
 
-%META:TOPICMOVED{by="roman" date="1624971526" from="Sovtest.ListServersSovtestLocal" to="Sovtest.ListOfServersOneLocal"}%
 %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"}%

+ 0 - 1
docs/wiki/foswiki/data/ListSwitchesSovtestLocal.txt

@@ -23,7 +23,6 @@ format="| [[$topic][$formfield(DnsName)]] | $formfield(DeviceIP) | $formfield(Ve
 
 -- Main.RomanDmitriev - 2020/10/11
 
-%META:TOPICMOVED{by="roman" date="1602510684" from="Sovtest.SwitchesOneLocal" to="One.ListSwitchesJmtcLocal"}%
 %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"}%

+ 0 - 1
docs/wiki/foswiki/data/ManStatCommonSovtestLocal.txt

@@ -16,7 +16,6 @@
 
 -- Main.RomanDmitriev - 16 Oct 2020
 
-%META:TOPICMOVED{by="roman" date="1603099414" from="Sovtest.ManStatOneLocal" to="One.ManStatCommonJmtcLocal"}%
 %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"}%

+ 0 - 1
docs/wiki/foswiki/data/NetworkOneLocal.txt

@@ -12,7 +12,6 @@
 
 -- Main.RomanDmitriev - 2020/10/10 
 
-%META:TOPICMOVED{by="roman" date="1624971564" from="Sovtest.NetworkSovtestLocal" to="Sovtest.NetworkOneLocal"}%
 %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"}%

File diff suppressed because it is too large
+ 0 - 0
docs/wiki/foswiki/data/SubnetLook.txt


Some files were not shown because too many files changed in this diff