Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

1.4.052511

  • Loading branch information...
commit 8a9e1f6af5d284fae7d20382cb191cab7638cfa6 1 parent b45386f
David Touzeau authored
Showing with 1,373 additions and 756 deletions.
  1. +1 −1  VERSION
  2. +6 −5 WHATSNEW
  3. +12 −0 admin.tabs.php
  4. BIN  bin/artica-compile
  5. BIN  bin/artica-install
  6. BIN  bin/process1
  7. BIN  bin/setup-centos
  8. BIN  bin/setup-debian
  9. BIN  bin/setup-fedora
  10. BIN  bin/setup-mandrake
  11. BIN  bin/setup-suse
  12. BIN  bin/setup-ubuntu
  13. +131 −127 bin/src/artica-install/artica_install.lpi
  14. +13 −1 bin/src/artica-install/artica_install.pas
  15. +3 −1 bin/src/artica-install/assp.pas
  16. +125 −119 bin/src/artica-install/backup/artica_install.lpi.bak
  17. +12 −9 bin/src/artica-install/backup/artica_install.pas.bak
  18. +4 −2 bin/src/artica-install/backup/assp.pas.bak
  19. +5 −9 bin/src/artica-install/backup/class_install.pas.bak
  20. +14 −1 bin/src/artica-install/backup/cyrus.pas.bak
  21. +20 −30 bin/src/artica-install/backup/global_conf.pas.bak
  22. +9 −7 bin/src/artica-install/backup/kavm4mls.pas.bak
  23. +47 −14 bin/src/artica-install/backup/lvm.pas.bak
  24. +11 −1 bin/src/artica-install/backup/mysql_daemon.pas.bak
  25. +2 −6 bin/src/artica-install/backup/postfix_addons.pas.bak
  26. +3 −11 bin/src/artica-install/backup/process_infos.pas.bak
  27. +13 −2 bin/src/artica-install/backup/zsystem.pas.bak
  28. +4 −8 bin/src/artica-install/class_install.pas
  29. +15 −0 bin/src/artica-install/cyrus.pas
  30. +20 −30 bin/src/artica-install/global_conf.pas
  31. +2 −8 bin/src/artica-install/kavm4mls.pas
  32. +1 −15 bin/src/artica-install/lvm.pas
  33. +9 −0 bin/src/artica-install/mysql_daemon.pas
  34. +3 −6 bin/src/artica-install/p3scan.pas
  35. +1 −6 bin/src/artica-install/postfix_addons.pas
  36. +1 −14 bin/src/artica-install/process_infos.pas
  37. +9 −1 bin/src/artica-install/zsystem.pas
  38. +14 −7 bin/src/process1/backup/principale.pas.bak
  39. +32 −32 bin/src/process1/backup/process1.lpi.bak
  40. +13 −7 bin/src/process1/principale.pas
  41. +33 −33 bin/src/process1/process1.lpi
  42. +71 −4 bin/src/setup-ubuntu/backup/setup_centos_class.pas.bak
  43. +36 −2 bin/src/setup-ubuntu/backup/setup_libs.pas.bak
  44. +63 −63 bin/src/setup-ubuntu/backup/setup_ubuntu.lpi.bak
  45. +2 −2 bin/src/setup-ubuntu/backup/setup_ubuntu.pas.bak
  46. +1 −1  bin/src/setup-ubuntu/backup/setup_ubuntu_class.pas.bak
  47. +70 −3 bin/src/setup-ubuntu/setup_centos_class.pas
  48. +36 −3 bin/src/setup-ubuntu/setup_libs.pas
  49. +63 −63 bin/src/setup-ubuntu/setup_ubuntu.lpi
  50. +1 −1  bin/src/setup-ubuntu/setup_ubuntu.pas
  51. +1 −0  bin/src/setup-ubuntu/setup_ubuntu_class.pas
  52. +12 −10 default.js
  53. +9 −1 domains.edit.attachblocking.ou.php
  54. +1 −3 domains.manage.org.index.php
  55. +12 −7 exec.dansguardian.last.php
  56. +1 −0  exec.executor.php
  57. +26 −0 exec.maillog.php
  58. +1 −1  exec.parse-orders.php
  59. +3 −0  exec.postfix.maincf.php
  60. +8 −3 exec.virtuals-ip.php
  61. +17 −0 framework/class.unix.inc
  62. +5 −2 logon.php
  63. +1 −1  ntpd.index.php
  64. +1 −1  ressources/VERSION
  65. +27 −6 ressources/class.amavis.inc
  66. +22 −12 ressources/class.dhcpd.inc
  67. +7 −1 ressources/class.templates.inc
  68. +8 −1 ressources/class.users.menus.inc
  69. +16 −2 ressources/language/en.db
  70. +21 −1 ressources/language/en/language.txt
  71. +20 −6 ressources/language/es.db
  72. +20 −0 ressources/language/es/language.txt
  73. +17 −6 ressources/language/fr.db
  74. +17 −0 ressources/language/fr/language.txt
  75. +20 −6 ressources/language/it.db
  76. +20 −0 ressources/language/it/language.txt
  77. +20 −6 ressources/language/po.db
  78. +20 −0 ressources/language/po/language.txt
  79. +1 −1  squid.newbee.php
  80. +14 −5 system.internal.disks.php
  81. +17 −0 user-backup/framework/class.unix.inc
  82. +27 −6 user-backup/ressources/class.amavis.inc
  83. +22 −12 user-backup/ressources/class.dhcpd.inc
  84. +8 −1 user-backup/ressources/class.users.menus.inc
2  VERSION
View
@@ -1 +1 @@
-1.4.052216
+1.4.052511
11 WHATSNEW
View
@@ -1,4 +1,4 @@
-1.4.052216:
+1.4.052511:
========================================================================================
Interface Changes
@@ -11,7 +11,7 @@ Messaging Changes:
-----------------------------------------------
1.4.052020: Adding possibility to remove Kaspersky Anti-Spam trough Setup Center.
1.4.052113: Fix unable to save Messages Size limit configuration in production.
-
+1.4.052417: Add a new watchdog action on "DBERROR db4: DB_AUTO_COMMIT may not be specified in non-transactional environment" in Cyrus-imap
Proxy Changes:
-------------------------------------------------
@@ -30,11 +30,11 @@ System Changes
The scheduler artica-cron process tis in charge of run all others services one minute after it started.
This to speedup the boot time when restart the computer and to not wait for a long time to display Artica Interface.
This feature prepare appliances...
+
+1.4.052417: Fix default Mysql databases are not installed on a fresh Artica install on CentOS systems.
+1.4.052417: Adding ATrpms repostpry for setup-centos http://atrpms.net/
-https://forum.debian-fr.org/viewtopic.php?f=3&t=7164&start=0&st=0&sk=t&sd=a
-http://www.shallalist.de/licence.html
-
1.4.051818:
========================================================================================
@@ -53,6 +53,7 @@ Messaging Changes:
1.4.051717: Consolidating PoMMo starting process.
+
Proxy Changes:
-------------------------------------------------
1.4.051623: Introduce squidGuard support.
12 admin.tabs.php
View
@@ -21,6 +21,7 @@
if(isset($_GET["move-widget"])){echo manage_icon_move();exit;}
if(isset($_GET["widget-manage-list"])){echo manage_icons_list($_GET["widget-manage-list"]);exit;}
if(isset($_GET["main"])){switch_main();exit;}
+if(isset($_GET["left-menus"])){left_menus();exit;}
@@ -950,4 +951,15 @@ function kas_stats(){
echo $tpl->_ENGINE_parse_body($p);
}
+function left_menus(){
+ if(!isset($_SESSION["uid"])){return null;}
+ $menus=new usersMenus();
+ $tpl=new templates();
+ $menus=$menus->BuildLeftMenus();
+ $html="$menus<input type='hidden' id='add_new_organisation_text' value='{add_new_organisation_text}'>";
+
+ echo $tpl->_ENGINE_parse_body($html);
+
+}
+
?>
BIN  bin/artica-compile
View
Binary file not shown
BIN  bin/artica-install
View
Binary file not shown
BIN  bin/process1
View
Binary file not shown
BIN  bin/setup-centos
View
Binary file not shown
BIN  bin/setup-debian
View
Binary file not shown
BIN  bin/setup-fedora
View
Binary file not shown
BIN  bin/setup-mandrake
View
Binary file not shown
BIN  bin/setup-suse
View
Binary file not shown
BIN  bin/setup-ubuntu
View
Binary file not shown
258 bin/src/artica-install/artica_install.lpi
View
@@ -12,7 +12,7 @@
<MainUnit Value="0"/>
<TargetFileExt Value=""/>
<Title Value="artica-install"/>
- <ActiveEditorIndexAtStart Value="11"/>
+ <ActiveEditorIndexAtStart Value="6"/>
</General>
<VersionInfo>
<ProjectVersion Value=""/>
@@ -34,21 +34,21 @@
<Filename Value="artica_install.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="artica_install"/>
- <CursorPos X="32" Y="1452"/>
- <TopLine Value="1416"/>
+ <CursorPos X="23" Y="589"/>
+ <TopLine Value="554"/>
<EditorIndex Value="0"/>
<UsageCount Value="200"/>
<Bookmarks Count="1">
- <Item0 X="24" Y="2790" ID="1"/>
+ <Item0 X="24" Y="2802" ID="1"/>
</Bookmarks>
<Loaded Value="True"/>
</Unit0>
<Unit1>
<Filename Value="zsystem.pas"/>
<UnitName Value="zsystem"/>
- <CursorPos X="39" Y="1064"/>
- <TopLine Value="1030"/>
- <EditorIndex Value="11"/>
+ <CursorPos X="35" Y="259"/>
+ <TopLine Value="224"/>
+ <EditorIndex Value="13"/>
<UsageCount Value="102"/>
<Bookmarks Count="1">
<Item0 X="25" Y="53" ID="0"/>
@@ -58,32 +58,34 @@
<Unit2>
<Filename Value="process_infos.pas"/>
<UnitName Value="process_infos"/>
- <CursorPos X="25" Y="50"/>
- <TopLine Value="18"/>
- <UsageCount Value="5"/>
+ <CursorPos X="1" Y="357"/>
+ <TopLine Value="320"/>
+ <EditorIndex Value="2"/>
+ <UsageCount Value="13"/>
+ <Loaded Value="True"/>
</Unit2>
<Unit3>
<Filename Value="artica_menus.pas"/>
<UnitName Value="artica_menus"/>
<CursorPos X="27" Y="10"/>
<TopLine Value="10"/>
- <EditorIndex Value="3"/>
- <UsageCount Value="84"/>
+ <EditorIndex Value="8"/>
+ <UsageCount Value="98"/>
<Loaded Value="True"/>
</Unit3>
<Unit4>
<Filename Value="postfix_addons.pas"/>
<UnitName Value="postfix_addons"/>
- <CursorPos X="29" Y="32"/>
- <TopLine Value="14"/>
- <UsageCount Value="21"/>
+ <CursorPos X="84" Y="10"/>
+ <TopLine Value="1"/>
+ <UsageCount Value="19"/>
</Unit4>
<Unit5>
<Filename Value="global_conf.pas"/>
<UnitName Value="global_conf"/>
- <CursorPos X="1" Y="5482"/>
- <TopLine Value="5431"/>
- <EditorIndex Value="6"/>
+ <CursorPos X="65" Y="6607"/>
+ <TopLine Value="6563"/>
+ <EditorIndex Value="4"/>
<UsageCount Value="102"/>
<Bookmarks Count="1">
<Item0 X="1" Y="6407" ID="2"/>
@@ -93,12 +95,12 @@
<Unit6>
<Filename Value="class_install.pas"/>
<UnitName Value="class_install"/>
- <CursorPos X="17" Y="107"/>
- <TopLine Value="73"/>
- <EditorIndex Value="5"/>
+ <CursorPos X="35" Y="638"/>
+ <TopLine Value="587"/>
+ <EditorIndex Value="1"/>
<UsageCount Value="101"/>
<Bookmarks Count="1">
- <Item0 X="1" Y="7190" ID="3"/>
+ <Item0 X="1" Y="7186" ID="3"/>
</Bookmarks>
<Loaded Value="True"/>
</Unit6>
@@ -107,14 +109,14 @@
<UnitName Value="logs"/>
<CursorPos X="44" Y="2081"/>
<TopLine Value="2028"/>
- <UsageCount Value="93"/>
+ <UsageCount Value="91"/>
</Unit7>
<Unit8>
<Filename Value="samba.pas"/>
<UnitName Value="samba"/>
<CursorPos X="1" Y="900"/>
<TopLine Value="843"/>
- <EditorIndex Value="15"/>
+ <EditorIndex Value="17"/>
<UsageCount Value="105"/>
<Loaded Value="True"/>
</Unit8>
@@ -145,9 +147,9 @@
<Unit12>
<Filename Value="cyrus.pas"/>
<UnitName Value="cyrus"/>
- <CursorPos X="101" Y="2110"/>
- <TopLine Value="2076"/>
- <EditorIndex Value="4"/>
+ <CursorPos X="40" Y="115"/>
+ <TopLine Value="69"/>
+ <EditorIndex Value="9"/>
<UsageCount Value="116"/>
<Loaded Value="True"/>
</Unit12>
@@ -173,9 +175,7 @@
<UnitName Value="pureftpd"/>
<CursorPos X="5" Y="693"/>
<TopLine Value="623"/>
- <EditorIndex Value="1"/>
<UsageCount Value="206"/>
- <Loaded Value="True"/>
</Unit15>
<Unit16>
<Filename Value="openldap.pas"/>
@@ -198,7 +198,7 @@
<UnitName Value="ntpd"/>
<CursorPos X="10" Y="62"/>
<TopLine Value="1"/>
- <UsageCount Value="78"/>
+ <UsageCount Value="76"/>
</Unit18>
<Unit19>
<Filename Value="spfmilter.pas"/>
@@ -221,9 +221,7 @@
<UnitName Value="squid"/>
<CursorPos X="16" Y="1046"/>
<TopLine Value="1046"/>
- <EditorIndex Value="8"/>
<UsageCount Value="100"/>
- <Loaded Value="True"/>
</Unit21>
<Unit22>
<Filename Value="stunnel4.pas"/>
@@ -245,8 +243,8 @@
<Filename Value="postfix_class.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="postfix_class"/>
- <CursorPos X="101" Y="655"/>
- <TopLine Value="591"/>
+ <CursorPos X="1" Y="1"/>
+ <TopLine Value="1"/>
<UsageCount Value="200"/>
</Unit24>
<Unit25>
@@ -271,7 +269,7 @@
<UnitName Value="lighttpd"/>
<CursorPos X="27" Y="368"/>
<TopLine Value="336"/>
- <EditorIndex Value="10"/>
+ <EditorIndex Value="12"/>
<UsageCount Value="203"/>
<Loaded Value="True"/>
</Unit27>
@@ -296,7 +294,7 @@
<UnitName Value="dansguardian"/>
<CursorPos X="86" Y="814"/>
<TopLine Value="796"/>
- <UsageCount Value="99"/>
+ <UsageCount Value="97"/>
</Unit30>
<Unit31>
<Filename Value="monitorix.pas"/>
@@ -328,9 +326,7 @@
<UnitName Value="kav4proxy"/>
<CursorPos X="1" Y="384"/>
<TopLine Value="358"/>
- <EditorIndex Value="7"/>
<UsageCount Value="200"/>
- <Loaded Value="True"/>
</Unit34>
<Unit35>
<Filename Value="bind9.pas"/>
@@ -344,9 +340,11 @@
<Filename Value="mysql_daemon.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="mysql_daemon"/>
- <CursorPos X="18" Y="511"/>
- <TopLine Value="460"/>
+ <CursorPos X="1" Y="653"/>
+ <TopLine Value="613"/>
+ <EditorIndex Value="5"/>
<UsageCount Value="202"/>
+ <Loaded Value="True"/>
</Unit36>
<Unit37>
<Filename Value="fdm.pas"/>
@@ -361,15 +359,17 @@
<UnitName Value="obm"/>
<CursorPos X="50" Y="264"/>
<TopLine Value="224"/>
- <UsageCount Value="94"/>
+ <UsageCount Value="92"/>
</Unit38>
<Unit39>
<Filename Value="p3scan.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="p3scan"/>
- <CursorPos X="1" Y="1"/>
- <TopLine Value="233"/>
+ <CursorPos X="1" Y="124"/>
+ <TopLine Value="90"/>
+ <EditorIndex Value="7"/>
<UsageCount Value="212"/>
+ <Loaded Value="True"/>
</Unit39>
<Unit40>
<Filename Value="syslogng.pas"/>
@@ -377,7 +377,7 @@
<UnitName Value="syslogng"/>
<CursorPos X="36" Y="30"/>
<TopLine Value="1"/>
- <EditorIndex Value="14"/>
+ <EditorIndex Value="16"/>
<UsageCount Value="205"/>
<Loaded Value="True"/>
</Unit40>
@@ -411,7 +411,7 @@
<UnitName Value="artica_cron"/>
<CursorPos X="67" Y="562"/>
<TopLine Value="538"/>
- <EditorIndex Value="12"/>
+ <EditorIndex Value="14"/>
<UsageCount Value="200"/>
<Loaded Value="True"/>
</Unit44>
@@ -437,7 +437,7 @@
<UnitName Value="kas3"/>
<CursorPos X="82" Y="427"/>
<TopLine Value="378"/>
- <EditorIndex Value="9"/>
+ <EditorIndex Value="11"/>
<UsageCount Value="210"/>
<Loaded Value="True"/>
</Unit47>
@@ -590,7 +590,7 @@
<UnitName Value="openvpn"/>
<CursorPos X="1" Y="226"/>
<TopLine Value="156"/>
- <EditorIndex Value="13"/>
+ <EditorIndex Value="15"/>
<UsageCount Value="103"/>
<Loaded Value="True"/>
</Unit66>
@@ -695,7 +695,7 @@
<UnitName Value="autofs"/>
<CursorPos X="49" Y="257"/>
<TopLine Value="206"/>
- <UsageCount Value="79"/>
+ <UsageCount Value="77"/>
</Unit79>
<Unit80>
<Filename Value="nfsserver.pas"/>
@@ -717,9 +717,11 @@
<Filename Value="lvm.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="lvm"/>
- <CursorPos X="80" Y="289"/>
- <TopLine Value="268"/>
+ <CursorPos X="47" Y="120"/>
+ <TopLine Value="88"/>
+ <EditorIndex Value="3"/>
<UsageCount Value="200"/>
+ <Loaded Value="True"/>
</Unit82>
<Unit83>
<Filename Value="framework.pas"/>
@@ -741,9 +743,11 @@
<Filename Value="assp.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="assp"/>
- <CursorPos X="107" Y="254"/>
- <TopLine Value="208"/>
+ <CursorPos X="4" Y="129"/>
+ <TopLine Value="84"/>
+ <EditorIndex Value="10"/>
<UsageCount Value="200"/>
+ <Loaded Value="True"/>
</Unit85>
<Unit86>
<Filename Value="pdns.pas"/>
@@ -781,8 +785,8 @@
<Filename Value="kavm4mls.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="kavm4mls"/>
- <CursorPos X="47" Y="458"/>
- <TopLine Value="1"/>
+ <CursorPos X="110" Y="148"/>
+ <TopLine Value="95"/>
<UsageCount Value="201"/>
</Unit90>
<Unit91>
@@ -830,27 +834,27 @@
<UnitName Value="debian"/>
<CursorPos X="31" Y="31"/>
<TopLine Value="1"/>
- <UsageCount Value="38"/>
+ <UsageCount Value="36"/>
</Unit96>
<Unit97>
<Filename Value="install_common.pas"/>
<UnitName Value="install_common"/>
<CursorPos X="27" Y="19"/>
<TopLine Value="1"/>
- <UsageCount Value="54"/>
+ <UsageCount Value="52"/>
</Unit97>
<Unit98>
<Filename Value="debian_class.pas"/>
<UnitName Value="debian_class"/>
<CursorPos X="19" Y="29"/>
<TopLine Value="1"/>
- <UsageCount Value="3"/>
+ <UsageCount Value="1"/>
</Unit98>
<Unit99>
<Filename Value="../../../../../../../usr/share/fpcsrc/2.4.0/rtl/objpas/sysutils/sysstrh.inc"/>
<CursorPos X="23" Y="179"/>
<TopLine Value="165"/>
- <UsageCount Value="26"/>
+ <UsageCount Value="24"/>
</Unit99>
<Unit100>
<Filename Value="squidguard.pas"/>
@@ -858,139 +862,139 @@
<UnitName Value="squidguard"/>
<CursorPos X="51" Y="105"/>
<TopLine Value="52"/>
- <UsageCount Value="59"/>
+ <UsageCount Value="87"/>
</Unit100>
<Unit101>
<Filename Value="wifi.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="wifi"/>
- <CursorPos X="111" Y="203"/>
- <TopLine Value="154"/>
- <EditorIndex Value="2"/>
- <UsageCount Value="35"/>
+ <CursorPos X="22" Y="61"/>
+ <TopLine Value="35"/>
+ <EditorIndex Value="6"/>
+ <UsageCount Value="63"/>
<Loaded Value="True"/>
</Unit101>
</Units>
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
<Filename Value="global_conf.pas"/>
- <Caret Line="5541" Column="1" TopLine="5516"/>
+ <Caret Line="11560" Column="4" TopLine="11521"/>
</Position1>
<Position2>
- <Filename Value="global_conf.pas"/>
- <Caret Line="6015" Column="21" TopLine="5981"/>
+ <Filename Value="wifi.pas"/>
+ <Caret Line="416" Column="1" TopLine="356"/>
</Position2>
<Position3>
- <Filename Value="global_conf.pas"/>
- <Caret Line="426" Column="31" TopLine="393"/>
+ <Filename Value="wifi.pas"/>
+ <Caret Line="394" Column="121" TopLine="359"/>
</Position3>
<Position4>
- <Filename Value="class_install.pas"/>
- <Caret Line="593" Column="4" TopLine="559"/>
+ <Filename Value="wifi.pas"/>
+ <Caret Line="388" Column="1" TopLine="354"/>
</Position4>
<Position5>
- <Filename Value="class_install.pas"/>
- <Caret Line="1331" Column="37" TopLine="1298"/>
+ <Filename Value="global_conf.pas"/>
+ <Caret Line="11572" Column="103" TopLine="11423"/>
</Position5>
<Position6>
- <Filename Value="class_install.pas"/>
- <Caret Line="1342" Column="18" TopLine="1308"/>
+ <Filename Value="wifi.pas"/>
+ <Caret Line="43" Column="33" TopLine="1"/>
</Position6>
<Position7>
- <Filename Value="class_install.pas"/>
- <Caret Line="1473" Column="58" TopLine="1440"/>
+ <Filename Value="artica_install.pas"/>
+ <Caret Line="1007" Column="109" TopLine="980"/>
</Position7>
<Position8>
- <Filename Value="class_install.pas"/>
- <Caret Line="1479" Column="37" TopLine="1446"/>
+ <Filename Value="global_conf.pas"/>
+ <Caret Line="11515" Column="59" TopLine="11485"/>
</Position8>
<Position9>
- <Filename Value="class_install.pas"/>
- <Caret Line="1621" Column="53" TopLine="1589"/>
+ <Filename Value="global_conf.pas"/>
+ <Caret Line="11522" Column="11" TopLine="11490"/>
</Position9>
<Position10>
- <Filename Value="class_install.pas"/>
- <Caret Line="1652" Column="43" TopLine="1619"/>
+ <Filename Value="global_conf.pas"/>
+ <Caret Line="10938" Column="12" TopLine="10904"/>
</Position10>
<Position11>
- <Filename Value="class_install.pas"/>
- <Caret Line="1658" Column="44" TopLine="1625"/>
+ <Filename Value="global_conf.pas"/>
+ <Caret Line="10977" Column="1" TopLine="10943"/>
</Position11>
<Position12>
- <Filename Value="class_install.pas"/>
- <Caret Line="1683" Column="35" TopLine="1650"/>
+ <Filename Value="global_conf.pas"/>
+ <Caret Line="10937" Column="21" TopLine="10904"/>
</Position12>
<Position13>
- <Filename Value="class_install.pas"/>
- <Caret Line="1689" Column="44" TopLine="1655"/>
+ <Filename Value="global_conf.pas"/>
+ <Caret Line="4" Column="66" TopLine="1"/>
</Position13>
<Position14>
- <Filename Value="class_install.pas"/>
- <Caret Line="1865" Column="18" TopLine="1831"/>
+ <Filename Value="global_conf.pas"/>
+ <Caret Line="10" Column="26" TopLine="1"/>
</Position14>
<Position15>
- <Filename Value="class_install.pas"/>
- <Caret Line="1927" Column="50" TopLine="1893"/>
+ <Filename Value="artica_install.pas"/>
+ <Caret Line="255" Column="90" TopLine="222"/>
</Position15>
<Position16>
- <Filename Value="global_conf.pas"/>
- <Caret Line="425" Column="34" TopLine="388"/>
+ <Filename Value="artica_install.pas"/>
+ <Caret Line="1" Column="1" TopLine="1"/>
</Position16>
<Position17>
- <Filename Value="global_conf.pas"/>
- <Caret Line="1" Column="1" TopLine="1"/>
+ <Filename Value="artica_install.pas"/>
+ <Caret Line="595" Column="33" TopLine="560"/>
</Position17>
<Position18>
- <Filename Value="global_conf.pas"/>
- <Caret Line="657" Column="25" TopLine="623"/>
+ <Filename Value="class_install.pas"/>
+ <Caret Line="229" Column="17" TopLine="1"/>
</Position18>
<Position19>
- <Filename Value="global_conf.pas"/>
- <Caret Line="5482" Column="14" TopLine="5448"/>
+ <Filename Value="artica_install.pas"/>
+ <Caret Line="595" Column="33" TopLine="560"/>
</Position19>
<Position20>
- <Filename Value="global_conf.pas"/>
- <Caret Line="9212" Column="1" TopLine="9178"/>
+ <Filename Value="artica_install.pas"/>
+ <Caret Line="1" Column="1" TopLine="1"/>
</Position20>
<Position21>
- <Filename Value="global_conf.pas"/>
- <Caret Line="657" Column="1" TopLine="623"/>
+ <Filename Value="artica_install.pas"/>
+ <Caret Line="589" Column="23" TopLine="554"/>
</Position21>
<Position22>
- <Filename Value="artica_install.pas"/>
- <Caret Line="268" Column="49" TopLine="214"/>
+ <Filename Value="class_install.pas"/>
+ <Caret Line="224" Column="25" TopLine="190"/>
</Position22>
<Position23>
- <Filename Value="artica_install.pas"/>
- <Caret Line="878" Column="15" TopLine="841"/>
+ <Filename Value="class_install.pas"/>
+ <Caret Line="1200" Column="28" TopLine="1165"/>
</Position23>
<Position24>
- <Filename Value="artica_install.pas"/>
- <Caret Line="1" Column="1" TopLine="1"/>
+ <Filename Value="global_conf.pas"/>
+ <Caret Line="427" Column="28" TopLine="393"/>
</Position24>
<Position25>
- <Filename Value="artica_install.pas"/>
- <Caret Line="1452" Column="32" TopLine="1416"/>
+ <Filename Value="class_install.pas"/>
+ <Caret Line="638" Column="35" TopLine="587"/>
</Position25>
<Position26>
- <Filename Value="zsystem.pas"/>
- <Caret Line="7729" Column="34" TopLine="7667"/>
+ <Filename Value="process_infos.pas"/>
+ <Caret Line="346" Column="40" TopLine="324"/>
</Position26>
<Position27>
- <Filename Value="zsystem.pas"/>
- <Caret Line="1" Column="1" TopLine="1"/>
+ <Filename Value="process_infos.pas"/>
+ <Caret Line="343" Column="52" TopLine="320"/>
</Position27>
<Position28>
- <Filename Value="zsystem.pas"/>
- <Caret Line="1853" Column="30" TopLine="1818"/>
+ <Filename Value="lvm.pas"/>
+ <Caret Line="289" Column="80" TopLine="268"/>
</Position28>
<Position29>
- <Filename Value="zsystem.pas"/>
- <Caret Line="4274" Column="29" TopLine="4240"/>
+ <Filename Value="lvm.pas"/>
+ <Caret Line="176" Column="1" TopLine="149"/>
</Position29>
<Position30>
- <Filename Value="zsystem.pas"/>
- <Caret Line="1" Column="1" TopLine="1"/>
+ <Filename Value="lvm.pas"/>
+ <Caret Line="152" Column="10" TopLine="122"/>
</Position30>
</JumpHistory>
</ProjectOptions>
@@ -1023,7 +1027,7 @@
</Item1>
<Item2>
<Source Value="global_conf.pas"/>
- <Line Value="12074"/>
+ <Line Value="12064"/>
</Item2>
<Item3>
<Source Value="global_conf.pas"/>
@@ -1039,7 +1043,7 @@
</Item5>
<Item6>
<Source Value="process_infos.pas"/>
- <Line Value="501"/>
+ <Line Value="497"/>
</Item6>
<Item7>
<Source Value="obm.pas"/>
@@ -1067,7 +1071,7 @@
</Item12>
<Item13>
<Source Value="zsystem.pas"/>
- <Line Value="2256"/>
+ <Line Value="2257"/>
</Item13>
<Item14>
<Source Value="global_conf.pas"/>
@@ -1075,11 +1079,11 @@
</Item14>
<Item15>
<Source Value="artica_install.pas"/>
- <Line Value="2004"/>
+ <Line Value="2016"/>
</Item15>
<Item16>
<Source Value="artica_install.pas"/>
- <Line Value="2317"/>
+ <Line Value="2329"/>
</Item16>
</BreakPoints>
<Exceptions Count="2">
14 bin/src/artica-install/artica_install.pas
View
@@ -258,7 +258,11 @@
halt(0);
end;
-
+ if ParamStr(2)='hostapd' then begin
+ zwifi:=twifi.Create(SYS);
+ writeln(zwifi.HOSTAPD_VERSION());
+ halt(0);
+ end;
writeln('help:');
writeln('--export-version squid');
@@ -266,6 +270,7 @@
writeln('--export-version dansguardian');
writeln('--export-version kav4proxy');
writeln('--export-version wpa_suppliant');
+ writeln('--export-version hostapd');
halt(0);
end;
@@ -1011,6 +1016,13 @@
CCYRUS.CheckRightsAndConfig();
halt(0);
end;
+
+
+
+ if ParamStr(1)='--cyrus-ctl-cyrusdb' then begin
+ CCYRUS.RECOVER_CYRUS_DB_SINGLE();
+ halt(0);
+ end;
if ParamStr(1)='--cyrus-recoverdb' then begin
CCYRUS.MASTER_RECOVER();
halt(0);
4 bin/src/artica-install/assp.pas
View
@@ -23,7 +23,7 @@ tassp=class
EnableASSPBackup:integer;
NotASSPRemovePass:integer;
EnablePostfixMultiInstance:integer;
- procedure CHECK_POSTFIX();
+
function PID_NUM():string;
procedure REMOVEPASSWORD();
procedure allowAdminConnectionsFrom();
@@ -37,6 +37,7 @@ tassp=class
function VERSION():string;
procedure START();
procedure STOP();
+ procedure CHECK_POSTFIX();
FUNCTION STATUS():string;
function RELOAD():string;
END;
@@ -125,6 +126,7 @@ function tassp.RELOAD():string;
end;
LDAP_CONFIG();
+ CHECK_POSTFIX();
logs.OutputCmd('/bin/kill -HUP '+pid);
end;
244 bin/src/artica-install/backup/artica_install.lpi.bak
View
@@ -12,7 +12,7 @@
<MainUnit Value="0"/>
<TargetFileExt Value=""/>
<Title Value="artica-install"/>
- <ActiveEditorIndexAtStart Value="12"/>
+ <ActiveEditorIndexAtStart Value="2"/>
</General>
<VersionInfo>
<ProjectVersion Value=""/>
@@ -34,21 +34,21 @@
<Filename Value="artica_install.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="artica_install"/>
- <CursorPos X="15" Y="878"/>
- <TopLine Value="841"/>
+ <CursorPos X="23" Y="589"/>
+ <TopLine Value="554"/>
<EditorIndex Value="0"/>
<UsageCount Value="200"/>
<Bookmarks Count="1">
- <Item0 X="24" Y="2790" ID="1"/>
+ <Item0 X="24" Y="2802" ID="1"/>
</Bookmarks>
<Loaded Value="True"/>
</Unit0>
<Unit1>
<Filename Value="zsystem.pas"/>
<UnitName Value="zsystem"/>
- <CursorPos X="34" Y="7729"/>
- <TopLine Value="7667"/>
- <EditorIndex Value="11"/>
+ <CursorPos X="35" Y="259"/>
+ <TopLine Value="224"/>
+ <EditorIndex Value="14"/>
<UsageCount Value="102"/>
<Bookmarks Count="1">
<Item0 X="25" Y="53" ID="0"/>
@@ -58,32 +58,34 @@
<Unit2>
<Filename Value="process_infos.pas"/>
<UnitName Value="process_infos"/>
- <CursorPos X="25" Y="50"/>
- <TopLine Value="18"/>
- <UsageCount Value="5"/>
+ <CursorPos X="1" Y="357"/>
+ <TopLine Value="320"/>
+ <EditorIndex Value="2"/>
+ <UsageCount Value="11"/>
+ <Loaded Value="True"/>
</Unit2>
<Unit3>
<Filename Value="artica_menus.pas"/>
<UnitName Value="artica_menus"/>
<CursorPos X="27" Y="10"/>
<TopLine Value="10"/>
- <EditorIndex Value="3"/>
- <UsageCount Value="83"/>
+ <EditorIndex Value="9"/>
+ <UsageCount Value="96"/>
<Loaded Value="True"/>
</Unit3>
<Unit4>
<Filename Value="postfix_addons.pas"/>
<UnitName Value="postfix_addons"/>
- <CursorPos X="29" Y="32"/>
- <TopLine Value="14"/>
- <UsageCount Value="21"/>
+ <CursorPos X="84" Y="10"/>
+ <TopLine Value="1"/>
+ <UsageCount Value="19"/>
</Unit4>
<Unit5>
<Filename Value="global_conf.pas"/>
<UnitName Value="global_conf"/>
- <CursorPos X="1" Y="5482"/>
- <TopLine Value="5431"/>
- <EditorIndex Value="6"/>
+ <CursorPos X="65" Y="6607"/>
+ <TopLine Value="6563"/>
+ <EditorIndex Value="4"/>
<UsageCount Value="102"/>
<Bookmarks Count="1">
<Item0 X="1" Y="6407" ID="2"/>
@@ -93,12 +95,12 @@
<Unit6>
<Filename Value="class_install.pas"/>
<UnitName Value="class_install"/>
- <CursorPos X="73" Y="1931"/>
- <TopLine Value="1893"/>
- <EditorIndex Value="5"/>
+ <CursorPos X="35" Y="638"/>
+ <TopLine Value="587"/>
+ <EditorIndex Value="1"/>
<UsageCount Value="101"/>
<Bookmarks Count="1">
- <Item0 X="1" Y="7190" ID="3"/>
+ <Item0 X="1" Y="7186" ID="3"/>
</Bookmarks>
<Loaded Value="True"/>
</Unit6>
@@ -107,14 +109,14 @@
<UnitName Value="logs"/>
<CursorPos X="44" Y="2081"/>
<TopLine Value="2028"/>
- <UsageCount Value="93"/>
+ <UsageCount Value="91"/>
</Unit7>
<Unit8>
<Filename Value="samba.pas"/>
<UnitName Value="samba"/>
<CursorPos X="1" Y="900"/>
<TopLine Value="843"/>
- <EditorIndex Value="15"/>
+ <EditorIndex Value="18"/>
<UsageCount Value="105"/>
<Loaded Value="True"/>
</Unit8>
@@ -145,9 +147,9 @@
<Unit12>
<Filename Value="cyrus.pas"/>
<UnitName Value="cyrus"/>
- <CursorPos X="101" Y="2110"/>
- <TopLine Value="2076"/>
- <EditorIndex Value="4"/>
+ <CursorPos X="40" Y="115"/>
+ <TopLine Value="69"/>
+ <EditorIndex Value="10"/>
<UsageCount Value="116"/>
<Loaded Value="True"/>
</Unit12>
@@ -173,7 +175,7 @@
<UnitName Value="pureftpd"/>
<CursorPos X="5" Y="693"/>
<TopLine Value="623"/>
- <EditorIndex Value="1"/>
+ <EditorIndex Value="6"/>
<UsageCount Value="206"/>
<Loaded Value="True"/>
</Unit15>
@@ -198,7 +200,7 @@
<UnitName Value="ntpd"/>
<CursorPos X="10" Y="62"/>
<TopLine Value="1"/>
- <UsageCount Value="78"/>
+ <UsageCount Value="76"/>
</Unit18>
<Unit19>
<Filename Value="spfmilter.pas"/>
@@ -221,9 +223,7 @@
<UnitName Value="squid"/>
<CursorPos X="16" Y="1046"/>
<TopLine Value="1046"/>
- <EditorIndex Value="8"/>
<UsageCount Value="100"/>
- <Loaded Value="True"/>
</Unit21>
<Unit22>
<Filename Value="stunnel4.pas"/>
@@ -245,8 +245,8 @@
<Filename Value="postfix_class.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="postfix_class"/>
- <CursorPos X="101" Y="655"/>
- <TopLine Value="591"/>
+ <CursorPos X="1" Y="1"/>
+ <TopLine Value="1"/>
<UsageCount Value="200"/>
</Unit24>
<Unit25>
@@ -271,7 +271,7 @@
<UnitName Value="lighttpd"/>
<CursorPos X="27" Y="368"/>
<TopLine Value="336"/>
- <EditorIndex Value="10"/>
+ <EditorIndex Value="13"/>
<UsageCount Value="203"/>
<Loaded Value="True"/>
</Unit27>
@@ -296,7 +296,7 @@
<UnitName Value="dansguardian"/>
<CursorPos X="86" Y="814"/>
<TopLine Value="796"/>
- <UsageCount Value="99"/>
+ <UsageCount Value="97"/>
</Unit30>
<Unit31>
<Filename Value="monitorix.pas"/>
@@ -328,9 +328,7 @@
<UnitName Value="kav4proxy"/>
<CursorPos X="1" Y="384"/>
<TopLine Value="358"/>
- <EditorIndex Value="7"/>
<UsageCount Value="200"/>
- <Loaded Value="True"/>
</Unit34>
<Unit35>
<Filename Value="bind9.pas"/>
@@ -344,9 +342,11 @@
<Filename Value="mysql_daemon.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="mysql_daemon"/>
- <CursorPos X="18" Y="511"/>
- <TopLine Value="460"/>
+ <CursorPos X="1" Y="653"/>
+ <TopLine Value="613"/>
+ <EditorIndex Value="5"/>
<UsageCount Value="202"/>
+ <Loaded Value="True"/>
</Unit36>
<Unit37>
<Filename Value="fdm.pas"/>
@@ -361,15 +361,17 @@
<UnitName Value="obm"/>
<CursorPos X="50" Y="264"/>
<TopLine Value="224"/>
- <UsageCount Value="94"/>
+ <UsageCount Value="92"/>
</Unit38>
<Unit39>
<Filename Value="p3scan.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="p3scan"/>
- <CursorPos X="1" Y="1"/>
- <TopLine Value="233"/>
+ <CursorPos X="1" Y="124"/>
+ <TopLine Value="90"/>
+ <EditorIndex Value="8"/>
<UsageCount Value="212"/>
+ <Loaded Value="True"/>
</Unit39>
<Unit40>
<Filename Value="syslogng.pas"/>
@@ -377,7 +379,7 @@
<UnitName Value="syslogng"/>
<CursorPos X="36" Y="30"/>
<TopLine Value="1"/>
- <EditorIndex Value="14"/>
+ <EditorIndex Value="17"/>
<UsageCount Value="205"/>
<Loaded Value="True"/>
</Unit40>
@@ -411,7 +413,7 @@
<UnitName Value="artica_cron"/>
<CursorPos X="67" Y="562"/>
<TopLine Value="538"/>
- <EditorIndex Value="12"/>
+ <EditorIndex Value="15"/>
<UsageCount Value="200"/>
<Loaded Value="True"/>
</Unit44>
@@ -437,7 +439,7 @@
<UnitName Value="kas3"/>
<CursorPos X="82" Y="427"/>
<TopLine Value="378"/>
- <EditorIndex Value="9"/>
+ <EditorIndex Value="12"/>
<UsageCount Value="210"/>
<Loaded Value="True"/>
</Unit47>
@@ -590,7 +592,7 @@
<UnitName Value="openvpn"/>
<CursorPos X="1" Y="226"/>
<TopLine Value="156"/>
- <EditorIndex Value="13"/>
+ <EditorIndex Value="16"/>
<UsageCount Value="103"/>
<Loaded Value="True"/>
</Unit66>
@@ -695,7 +697,7 @@
<UnitName Value="autofs"/>
<CursorPos X="49" Y="257"/>
<TopLine Value="206"/>
- <UsageCount Value="79"/>
+ <UsageCount Value="77"/>
</Unit79>
<Unit80>
<Filename Value="nfsserver.pas"/>
@@ -741,9 +743,11 @@
<Filename Value="assp.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="assp"/>
- <CursorPos X="107" Y="254"/>
- <TopLine Value="208"/>
+ <CursorPos X="4" Y="129"/>
+ <TopLine Value="84"/>
+ <EditorIndex Value="11"/>
<UsageCount Value="200"/>
+ <Loaded Value="True"/>
</Unit85>
<Unit86>
<Filename Value="pdns.pas"/>
@@ -781,9 +785,11 @@
<Filename Value="kavm4mls.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="kavm4mls"/>
- <CursorPos X="47" Y="458"/>
- <TopLine Value="1"/>
+ <CursorPos X="110" Y="148"/>
+ <TopLine Value="95"/>
+ <EditorIndex Value="3"/>
<UsageCount Value="201"/>
+ <Loaded Value="True"/>
</Unit90>
<Unit91>
<Filename Value="postfilter.pas"/>
@@ -830,27 +836,27 @@
<UnitName Value="debian"/>
<CursorPos X="31" Y="31"/>
<TopLine Value="1"/>
- <UsageCount Value="38"/>
+ <UsageCount Value="36"/>
</Unit96>
<Unit97>
<Filename Value="install_common.pas"/>
<UnitName Value="install_common"/>
<CursorPos X="27" Y="19"/>
<TopLine Value="1"/>
- <UsageCount Value="54"/>
+ <UsageCount Value="52"/>
</Unit97>
<Unit98>
<Filename Value="debian_class.pas"/>
<UnitName Value="debian_class"/>
<CursorPos X="19" Y="29"/>
<TopLine Value="1"/>
- <UsageCount Value="3"/>
+ <UsageCount Value="1"/>
</Unit98>
<Unit99>
<Filename Value="../../../../../../../usr/share/fpcsrc/2.4.0/rtl/objpas/sysutils/sysstrh.inc"/>
<CursorPos X="23" Y="179"/>
<TopLine Value="165"/>
- <UsageCount Value="26"/>
+ <UsageCount Value="24"/>
</Unit99>
<Unit100>
<Filename Value="squidguard.pas"/>
@@ -858,139 +864,139 @@
<UnitName Value="squidguard"/>
<CursorPos X="51" Y="105"/>
<TopLine Value="52"/>
- <UsageCount Value="56"/>
+ <UsageCount Value="84"/>
</Unit100>
<Unit101>
<Filename Value="wifi.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="wifi"/>
- <CursorPos X="111" Y="203"/>
- <TopLine Value="154"/>
- <EditorIndex Value="2"/>
- <UsageCount Value="32"/>
+ <CursorPos X="11" Y="332"/>
+ <TopLine Value="276"/>
+ <EditorIndex Value="7"/>
+ <UsageCount Value="60"/>
<Loaded Value="True"/>
</Unit101>
</Units>
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
- <Filename Value="global_conf.pas"/>
- <Caret Line="4981" Column="35" TopLine="4947"/>
+ <Filename Value="kavm4mls.pas"/>
+ <Caret Line="131" Column="5" TopLine="97"/>
</Position1>
<Position2>
- <Filename Value="global_conf.pas"/>
- <Caret Line="6315" Column="1" TopLine="6283"/>
+ <Filename Value="kavm4mls.pas"/>
+ <Caret Line="130" Column="1" TopLine="96"/>
</Position2>
<Position3>
<Filename Value="global_conf.pas"/>
- <Caret Line="1" Column="1" TopLine="1"/>
+ <Caret Line="18" Column="9" TopLine="1"/>
</Position3>
<Position4>
<Filename Value="global_conf.pas"/>
- <Caret Line="5538" Column="24" TopLine="5511"/>
+ <Caret Line="11560" Column="4" TopLine="11521"/>
</Position4>
<Position5>
- <Filename Value="global_conf.pas"/>
- <Caret Line="5541" Column="1" TopLine="5507"/>
+ <Filename Value="wifi.pas"/>
+ <Caret Line="416" Column="1" TopLine="356"/>
</Position5>
<Position6>
- <Filename Value="global_conf.pas"/>
- <Caret Line="5612" Column="91" TopLine="5579"/>
+ <Filename Value="wifi.pas"/>
+ <Caret Line="394" Column="121" TopLine="359"/>
</Position6>
<Position7>
- <Filename Value="global_conf.pas"/>
- <Caret Line="6013" Column="1" TopLine="5979"/>
+ <Filename Value="wifi.pas"/>
+ <Caret Line="388" Column="1" TopLine="354"/>
</Position7>
<Position8>
<Filename Value="global_conf.pas"/>
- <Caret Line="422" Column="47" TopLine="375"/>
+ <Caret Line="11572" Column="103" TopLine="11423"/>
</Position8>
<Position9>
- <Filename Value="global_conf.pas"/>
- <Caret Line="5541" Column="1" TopLine="5516"/>
+ <Filename Value="wifi.pas"/>
+ <Caret Line="43" Column="33" TopLine="1"/>
</Position9>
<Position10>
- <Filename Value="global_conf.pas"/>
- <Caret Line="6015" Column="21" TopLine="5981"/>
+ <Filename Value="artica_install.pas"/>
+ <Caret Line="1007" Column="109" TopLine="980"/>
</Position10>
<Position11>
<Filename Value="global_conf.pas"/>
- <Caret Line="426" Column="31" TopLine="393"/>
+ <Caret Line="11515" Column="59" TopLine="11485"/>
</Position11>
<Position12>
- <Filename Value="class_install.pas"/>
- <Caret Line="593" Column="4" TopLine="559"/>
+ <Filename Value="global_conf.pas"/>
+ <Caret Line="11522" Column="11" TopLine="11490"/>
</Position12>
<Position13>
- <Filename Value="class_install.pas"/>
- <Caret Line="1331" Column="37" TopLine="1298"/>
+ <Filename Value="global_conf.pas"/>
+ <Caret Line="10938" Column="12" TopLine="10904"/>
</Position13>
<Position14>
- <Filename Value="class_install.pas"/>
- <Caret Line="1342" Column="18" TopLine="1308"/>
+ <Filename Value="global_conf.pas"/>
+ <Caret Line="10977" Column="1" TopLine="10943"/>
</Position14>
<Position15>
- <Filename Value="class_install.pas"/>
- <Caret Line="1473" Column="58" TopLine="1440"/>
+ <Filename Value="global_conf.pas"/>
+ <Caret Line="10937" Column="21" TopLine="10904"/>
</Position15>
<Position16>
- <Filename Value="class_install.pas"/>
- <Caret Line="1479" Column="37" TopLine="1446"/>
+ <Filename Value="global_conf.pas"/>
+ <Caret Line="4" Column="66" TopLine="1"/>
</Position16>
<Position17>
- <Filename Value="class_install.pas"/>
- <Caret Line="1621" Column="53" TopLine="1589"/>
+ <Filename Value="global_conf.pas"/>
+ <Caret Line="10" Column="26" TopLine="1"/>
</Position17>
<Position18>
- <Filename Value="class_install.pas"/>
- <Caret Line="1652" Column="43" TopLine="1619"/>
+ <Filename Value="artica_install.pas"/>
+ <Caret Line="255" Column="90" TopLine="222"/>
</Position18>
<Position19>
- <Filename Value="class_install.pas"/>
- <Caret Line="1658" Column="44" TopLine="1625"/>
+ <Filename Value="artica_install.pas"/>
+ <Caret Line="1" Column="1" TopLine="1"/>
</Position19>
<Position20>
- <Filename Value="class_install.pas"/>
- <Caret Line="1683" Column="35" TopLine="1650"/>
+ <Filename Value="artica_install.pas"/>
+ <Caret Line="595" Column="33" TopLine="560"/>
</Position20>
<Position21>
<Filename Value="class_install.pas"/>
- <Caret Line="1689" Column="44" TopLine="1655"/>
+ <Caret Line="229" Column="17" TopLine="1"/>
</Position21>
<Position22>
- <Filename Value="class_install.pas"/>
- <Caret Line="1865" Column="18" TopLine="1831"/>
+ <Filename Value="artica_install.pas"/>
+ <Caret Line="595" Column="33" TopLine="560"/>
</Position22>
<Position23>
- <Filename Value="class_install.pas"/>
- <Caret Line="1927" Column="50" TopLine="1893"/>
+ <Filename Value="artica_install.pas"/>
+ <Caret Line="1" Column="1" TopLine="1"/>
</Position23>
<Position24>
- <Filename Value="global_conf.pas"/>
- <Caret Line="425" Column="34" TopLine="388"/>
+ <Filename Value="artica_install.pas"/>
+ <Caret Line="589" Column="23" TopLine="554"/>
</Position24>
<Position25>
- <Filename Value="global_conf.pas"/>
- <Caret Line="1" Column="1" TopLine="1"/>
+ <Filename Value="class_install.pas"/>
+ <Caret Line="224" Column="25" TopLine="190"/>
</Position25>
<Position26>
- <Filename Value="global_conf.pas"/>
- <Caret Line="657" Column="25" TopLine="623"/>
+ <Filename Value="class_install.pas"/>
+ <Caret Line="1200" Column="28" TopLine="1165"/>
</Position26>
<Position27>
<Filename Value="global_conf.pas"/>
- <Caret Line="5482" Column="14" TopLine="5448"/>
+ <Caret Line="427" Column="28" TopLine="393"/>
</Position27>
<Position28>
- <Filename Value="global_conf.pas"/>
- <Caret Line="9212" Column="1" TopLine="9178"/>
+ <Filename Value="class_install.pas"/>
+ <Caret Line="638" Column="35" TopLine="587"/>
</Position28>
<Position29>
- <Filename Value="global_conf.pas"/>
- <Caret Line="657" Column="1" TopLine="623"/>
+ <Filename Value="process_infos.pas"/>
+ <Caret Line="346" Column="40" TopLine="324"/>
</Position29>
<Position30>
- <Filename Value="artica_install.pas"/>
- <Caret Line="268" Column="49" TopLine="214"/>
+ <Filename Value="process_infos.pas"/>
+ <Caret Line="343" Column="52" TopLine="320"/>
</Position30>
</JumpHistory>
</ProjectOptions>
@@ -1023,7 +1029,7 @@
</Item1>
<Item2>
<Source Value="global_conf.pas"/>
- <Line Value="12074"/>
+ <Line Value="12064"/>
</Item2>
<Item3>
<Source Value="global_conf.pas"/>
@@ -1039,7 +1045,7 @@
</Item5>
<Item6>
<Source Value="process_infos.pas"/>
- <Line Value="501"/>
+ <Line Value="497"/>
</Item6>
<Item7>
<Source Value="obm.pas"/>
@@ -1067,7 +1073,7 @@
</Item12>
<Item13>
<Source Value="zsystem.pas"/>
- <Line Value="2252"/>
+ <Line Value="2257"/>
</Item13>
<Item14>
<Source Value="global_conf.pas"/>
@@ -1075,11 +1081,11 @@
</Item14>
<Item15>
<Source Value="artica_install.pas"/>
- <Line Value="2004"/>
+ <Line Value="2016"/>
</Item15>
<Item16>
<Source Value="artica_install.pas"/>
- <Line Value="2317"/>
+ <Line Value="2329"/>
</Item16>
</BreakPoints>
<Exceptions Count="2">
21 bin/src/artica-install/backup/artica_install.pas.bak
View
@@ -258,7 +258,11 @@ end;
halt(0);
end;
-
+ if ParamStr(2)='hostapd' then begin
+ zwifi:=twifi.Create(SYS);
+ writeln(zwifi.HOSTAPD_VERSION());
+ halt(0);
+ end;
writeln('help:');
writeln('--export-version squid');
@@ -870,14 +874,6 @@ end;
halt(0);
end;
- if ParamStr(1)='--bad-du' then begin
- GLOBAL_INI:=myconf.Create;
- GLOBAL_INI.KILL_BAD_DU();
- halt(0);
- end;
-
-
-
if paramStr(1)='--obm2-version' then begin
zobm2:=tobm2.Create(SYS);
@@ -1019,6 +1015,13 @@ if paramStr(1)='--kavmilter-reload' then begin
CCYRUS.CheckRightsAndConfig();
halt(0);
end;
+
+
+
+ if ParamStr(1)='--cyrus-ctl-cyrusdb' then begin
+ CCYRUS.RECOVER_CYRUS_DB_SINGLE();
+ halt(0);
+ end;
if ParamStr(1)='--cyrus-recoverdb' then begin
CCYRUS.MASTER_RECOVER();
halt(0);
6 bin/src/artica-install/backup/assp.pas.bak
View
@@ -23,7 +23,7 @@ private
EnableASSPBackup:integer;
NotASSPRemovePass:integer;
EnablePostfixMultiInstance:integer;
- procedure CHECK_POSTFIX();
+
function PID_NUM():string;
procedure REMOVEPASSWORD();
procedure allowAdminConnectionsFrom();
@@ -37,6 +37,7 @@ public
function VERSION():string;
procedure START();
procedure STOP();
+ procedure CHECK_POSTFIX();
FUNCTION STATUS():string;
function RELOAD():string;
END;
@@ -240,8 +241,9 @@ if FileExists('/etc/artica-postfix/mynetworks') then begin
logs.DebugLogs('tassp.InternalsIPs() reject mynetworks ='+z.Strings[i]);
continue;
end;
- logs.DebugLogs('tassp.InternalsIPs() math mynetworks ='+z.Strings[i]);
+
if SYS.ArrayAlreadyUsed(t,RegExpr.Match[1]+'.'+RegExpr.Match[2]+'.'+RegExpr.Match[3]) then continue;
+ logs.DebugLogs('tassp.InternalsIPs() math mynetworks ='+z.Strings[i]);
matchedIp:=RegExpr.Match[1]+'.'+RegExpr.Match[2]+'.'+RegExpr.Match[3];
noSpoofingCheckIP:=noSpoofingCheckIP+ matchedIp+'|';
mynets:=mynets+matchedIp+'|';
14 bin/src/artica-install/backup/class_install.pas.bak
View
@@ -9,7 +9,7 @@ uses
Classes, SysUtils,Process,strutils,IniFiles,RegExpr in 'RegExpr.pas',artica_cron,opengoo,
BaseUnix,unix,global_conf,zsystem,logs,geoip,debian,spamass,openldap,clamav,cyrus,squid,postfix_class,samba,awstats,process_infos,pureftpd,ntpd,spfmilter,
mailgraph_daemon, miltergreylist,lighttpd, roundcube,dansguardian,kav4samba,mimedefang,stunnel4,dkimfilter,kav4proxy,bind9,obm,mysql_daemon,p3scan,syslogng,openvpn,cups,
- jcheckmail,dhcp_server,obm2,dstat,rsync,smartd,tcpip,policyd_weight,apache_artica,autofs,framework,assp,pdns,gluster,nfsserver,zabbix,hamachi,postfilter, vmwaretools,zarafa_server,monit,wifi,
+ jcheckmail,dhcp_server,obm2,dstat,rsync,smartd,tcpip,policyd_weight,apache_artica,autofs,assp,pdns,gluster,nfsserver,zabbix,hamachi,postfilter, vmwaretools,zarafa_server,monit,wifi,
mailarchiver in '/home/dtouzeau/developpement/artica-postfix/bin/src/artica-install/mailarchiver.pas',
kas3 in '/home/dtouzeau/developpement/artica-postfix/bin/src/artica-install/kas3.pas',
kavmilter in '/home/dtouzeau/developpement/artica-postfix/bin/src/artica-install/kavmilter.pas',
@@ -581,7 +581,6 @@ var
jcheckmail:tjcheckmail;
dhcp3:tdhcp3;
logs:tlogs;
- zobm2:tobm2;
opengoo:topengoo;
cups:tcups;
dtstat:tdstat;
@@ -590,7 +589,6 @@ var
policydw:tpolicyd_weight;
autofs:tautofs;
mysql:tmysql_daemon;
- framework:tframework;
assp:tassp;
pdns:tpdns;
gluster:tgluster;
@@ -1254,7 +1252,6 @@ var
dhcp3:tdhcp3;
cron:tcron;
lighttpd:Tlighttpd;
- zobm2:tobm2;
opengoo:topengoo;
cups:tcups;
dstat:tdstat;
@@ -1749,7 +1746,7 @@ begin
if ParamStr(2)='daemon' then begin
if not SYS.BuildPids() then exit();
-
+ GLOBAL_INI.SYSTEM_START_MINIMUM_DAEMON();
monit.START();
exit();
end;
@@ -1923,8 +1920,8 @@ begin
if ParamStr(2)='all' then begin
fpsystem(GLOBAL_INI.get_ARTICA_PHP_PATH()+'/bin/process1 --force &');
- GLOBAL_INI.SYSTEM_START_ARTICA_DAEMON();
- GLOBAL_INI.SYSTEM_START_ARTICA_ALL_DAEMON();
+ GLOBAL_INI.SYSTEM_START_MINIMUM_DAEMON();
+ GLOBAL_INI.START_ALL_DAEMONS();
fpsystem(SYS.LOCATE_PHP5_BIN() +' ' + GLOBAL_INI.get_ARTICA_PHP_PATH() +'/exec.ldap.rebuild.php >/dev/null &');
exit();
end;
@@ -1944,8 +1941,7 @@ begin
fpsystem(GLOBAL_INI.get_ARTICA_PHP_PATH()+'/bin/process1 --force &');
- GLOBAL_INI.SYSTEM_START_ARTICA_DAEMON();
- GLOBAL_INI.SYSTEM_START_ARTICA_ALL_DAEMON();
+ GLOBAL_INI.SYSTEM_START_MINIMUM_DAEMON();
fpsystem(SYS.LOCATE_PHP5_BIN() +' ' + GLOBAL_INI.get_ARTICA_PHP_PATH() +'/exec.ldap.rebuild.php >/dev/null &');
writeln('');
writeln('');
15 bin/src/artica-install/backup/cyrus.pas.bak
View
@@ -112,6 +112,7 @@ public
procedure CheckRightsAndConfig();
function TestingMailBox(username:string;password:string):string;
procedure MASTER_RECOVER();
+ procedure RECOVER_CYRUS_DB_SINGLE();
//murder
@@ -420,7 +421,18 @@ begin
fpsystem(SYS.LOCATE_PHP5_BIN()+ ' ' + artica_path+'/exec.check-cyrus-account.php cyrus & >/dev/null 2>&1 &');
end;
//##############################################################################
+procedure Tcyrus.RECOVER_CYRUS_DB_SINGLE();
+var
+ configdirectory:string;
+begin
+
+if FileExists(SYS.LOCATE_ctl_cyrusdb()) then begin
+ CYRUS_DAEMON_STOP();
+ fpsystem('su - cyrus -c "'+SYS.LOCATE_ctl_cyrusdb()+' -r"');
+ CYRUS_DAEMON_START();
+end;
+//##############################################################################
procedure Tcyrus.MASTER_RECOVER();
var
configdirectory:string;
@@ -1991,6 +2003,7 @@ var
cmd_daemon:string;
ldap_member_base:string;
ldap_member_base_config:string;
+ lmtpsocket:string;
begin
if not FIleExists(CYRUS_DAEMON_BIN_PATH()) then begin
@@ -2135,7 +2148,7 @@ begin
if not FileExists('/var/spool/postfix/var/run/cyrus/socket/lmtp') then logs.OutputCmd('/bin/ln -s '+lmtpsocket+' /var/spool/postfix/var/run/cyrus/socket/lmtp');
end;
- if lmtpsocket<>
+
logs.OutputCmd('/bin/chown -R postfix:postfix /var/run/cyrus');
50 bin/src/artica-install/backup/global_conf.pas.bak
View
@@ -5479,7 +5479,6 @@ begin
if FileExists('/opt/artica/license.expired.conf') then DeleteFile('/opt/artica/license.expired.conf');
writeln('Starting......: Kernel version ' + kernel_version);
logs.DebugLogs('Starting......: Distribution "' + LINUX_DISTRIBUTION() + '" i' + SYSTEM_GET_PLATEFORM());
- KILL_BAD_DU();
lighttpd.LIGHTTPD_START();
ldap.LDAP_START();
Rootpath:=get_ARTICA_PHP_PATH();
@@ -5618,7 +5617,7 @@ begin
end;
-
+ fpsystem('/etc/init.d/artica-postfix start wifi');
logs.Debuglogs('############ gluster ##################');
@@ -10975,7 +10974,6 @@ begin
logs:=Tlogs.Create;
tempfile:=logs.FILE_TEMP();
- logerror:=logs.FILE_TEMP();
writeln('Stopping Artica daemon');
fpsystem('/etc/init.d/artica-postfix stop daemon');
@@ -11517,12 +11515,10 @@ end;
var
ini:string;
- D:Boolean;
pid:string;
begin
//
- D:=SYS.COMMANDLINE_PARAMETERS('--boa-status');
-
+ ini:='';
logs.Debuglogs('starting status BOA');
ini:=ini+ '[BOA]'+CRLF;
ini:=ini+ 'service_name=APP_BOA'+CRLF;
@@ -11553,22 +11549,20 @@ function myconf.LMB_LUNDIMATIN_VERSION():string;
var
ini:string;
- D:Boolean;
pid:string;
begin
-
- D:=SYS.COMMANDLINE_PARAMETERS('--boa-status');
- pid:=BOA_DAEMON_GET_PID();
- logs.Debuglogs('starting status BOA');
- ini:=ini+ '[BOA]'+CRLF;
- if SYS.PROCESS_EXIST(pid) then ini:=ini+ 'running=1'+CRLF else ini:=ini+ 'running=0'+CRLF;
- ini:=ini+ 'application_installed=1'+CRLF;
- ini:=ini+ 'master_pid='+ pid+CRLF;
- ini:=ini+ 'master_memory=' + IntToStr(SYS.PROCESS_MEMORY(pid))+CRLF;
- ini:=ini+ 'master_version=0.94.13'+CRLF;
- ini:=ini+ 'status='+SYS.PROCESS_STATUS(pid)+CRLF;
- ini:=ini+ 'service_name=APP_BOA'+CRLF;
- ini:=ini+ 'service_cmd=boa'+CRLF;
+ ini:='';
+ pid:=BOA_DAEMON_GET_PID();
+ logs.Debuglogs('starting status BOA');
+ ini:=ini+ '[BOA]'+CRLF;
+ if SYS.PROCESS_EXIST(pid) then ini:=ini+ 'running=1'+CRLF else ini:=ini+ 'running=0'+CRLF;
+ ini:=ini+ 'application_installed=1'+CRLF;
+ ini:=ini+ 'master_pid='+ pid+CRLF;
+ ini:=ini+ 'master_memory=' + IntToStr(SYS.PROCESS_MEMORY(pid))+CRLF;
+ ini:=ini+ 'master_version=0.94.13'+CRLF;
+ ini:=ini+ 'status='+SYS.PROCESS_STATUS(pid)+CRLF;
+ ini:=ini+ 'service_name=APP_BOA'+CRLF;
+ ini:=ini+ 'service_cmd=boa'+CRLF;
result:=ini;
end;
//#############################################################################
@@ -11664,7 +11658,6 @@ function myconf.SYSLOGER_STATUS():string;
var
ini:TstringList;
pid:string;
-Enabled:integer;
begin
ini:=TstringList.Create;
@@ -11755,9 +11748,8 @@ function myconf.LMB_VERSION():string;
var
l:Tstringlist;
tmpstr:string;
- mailcount:integer;
- RegExpr:TRegExpr;
- i:integer;
+ RegExpr:TRegExpr;
+ i:integer;
begin
tmpstr:='/usr/local/share/artica/lmb_src/config/config_serveur.inc.php';
if not FileExists(tmpstr) then exit;
@@ -11780,9 +11772,8 @@ function myconf.GROUPOFFICE_VERSION():string;
var
l:Tstringlist;
tmpstr:string;
- mailcount:integer;
- RegExpr:TRegExpr;
- i:integer;
+ RegExpr:TRegExpr;
+ i:integer;
begin
tmpstr:='/usr/local/share/artica/group-office/classes/base/config.class.inc.php';
if not FileExists(tmpstr) then exit;
@@ -11805,9 +11796,8 @@ function myconf.hpinlinux_VERSION():string;
var
l:Tstringlist;
tmpstr:string;
- mailcount:integer;
- RegExpr:TRegExpr;
- i:integer;
+ RegExpr:TRegExpr;
+ i:integer;
begin
result:=SYS.GET_CACHE_VERSION('APP_HPINLINUX');
16 bin/src/artica-install/backup/kavm4mls.pas.bak
View
@@ -127,8 +127,8 @@ procedure tkavm4mls.RELOAD();
var
pidlists:string;
RegExpr:TRegExpr;
- l:TstringList;
- i:Integer;
+
+
begin
pidlists:=KAV_MILTER_PID();
if length(pidlists)=0 then begin
@@ -205,6 +205,11 @@ ini.WriteString('1043','INSTROOT','/opt/kaspersky/kav4lms');
ini.WriteString('1043','NAME','Kaspersky Anti-Virus for Linux Mail Server');
ini.WriteString('1043','PATH_BASES','/var/opt/kaspersky/kav4lms/bases');
ini.WriteString('1043','PATH_LICENSES','/var/opt/kaspersky/kav4lms/licenses');
+ini.WriteString('1043','FILTER_SERVICE','true');
+ini.WriteString('1043','FILTER_PROGRAM','kav4lms-milter');
+ini.WriteString('1043','INITD_kav4lms','true');
+ini.WriteString('1043','INITD_kav4lms_filters','true');
+ini.WriteString('1043','PATH_LICENSES','/var/opt/kaspersky/kav4lms/licenses');
ini.WriteString('1043','USED_PKGMGR','deb');
ini.WriteString('1043','VERSION','5.6.42');
ini.UpdateFile;
@@ -215,13 +220,9 @@ end;
procedure tkavm4mls.START();
var
pidlists:string;
- RegExpr:TRegExpr;
- l:TstringList;
- i:Integer;
- Expired:boolean;
count:integer;
begin
-Expired:=false;
+
logs.Debuglogs('###################### kav4mls ######################');
@@ -460,6 +461,7 @@ spattern_date:string;
pids:string;
ini:TiniFile;
begin
+result:='';
if not FileExists('/opt/kav/5.6/kavmilter/bin/keepup2date') then exit;
logs.Debuglogs('tkavm4mls.PERFORM_UPDATE() kavmilterEnable='+SYS.GET_INFO('kavmilterEnable'));
if SYS.GET_INFO('kavmilterEnable')<>'1' then begin
61 bin/src/artica-install/backup/lvm.pas.bak
View
@@ -31,10 +31,12 @@ public
function STATUS:string;
function INITD_PATH():string;
function SCAN_DISKS():string;
+ function SCAN_DEV():string;
function SCAN_VG():string;
procedure RELOAD();
procedure pvcreate_dev(dev:string);
procedure vgcreate_dev(dev:string;groupname:string);
+
END;
implementation
@@ -115,9 +117,6 @@ SYS.SET_CACHE_VERSION('APP_NFS',result);
end;
//#############################################################################
procedure tlvm.RELOAD();
-var
- count:integer;
- pid:string;
begin
if not FileExists('/etc/artica-postfix/settings/Daemons/NFSExportConfig') then exit;
fpsystem('/bin/cp /etc/artica-postfix/settings/Daemons/NFSExportConfig /etc/exports');
@@ -147,7 +146,7 @@ begin
fpsystem(INITD_PATH()+' start');
if FileExists('/etc/init.d/nfs-common') then fpsystem('/etc/init.d/nfs-common start');
-
+count:=0;
while not SYS.PROCESS_EXIST(PID_NUM()) do begin
sleep(100);
@@ -171,15 +170,6 @@ end;
//#############################################################################
procedure tlvm.STOP();
-var
- count:integer;
- pid:string;
- tmp:string;
- l:Tstringlist;
- i:integer;
- tt:integer;
- path:string;
- RegExpr:TRegExpr;
begin
fpsystem(INITD_PATH()+' stop');
if FileExists('/etc/init.d/nfs-common') then fpsystem('/etc/init.d/nfs-common stop');
@@ -276,7 +266,7 @@ begin
for i:=0 to l.Count-1 do begin
if RegExpr.Exec(l.Strings[i]) then begin
logs.Debuglogs('Match[1]='+trim(RegExpr.Match[1])+' Match[2]='+trim(RegExpr.Match[2])+' Match[3]='+trim(RegExpr.Match[3])+' Match[4]='+trim(RegExpr.Match[4]));
- php.Add('$lvm_gdev["'+trim(RegExpr.Match[1])+'"]["+'+trim(RegExpr.Match[2])+'"]="'+trim(RegExpr.Match[4])+'";');
+ php.Add('$lvm_gdev["'+trim(RegExpr.Match[2])+'"]["'+trim(RegExpr.Match[1])+'"]="'+trim(RegExpr.Match[4])+'";');
end;
end;
@@ -291,6 +281,49 @@ begin
end;
//#############################################################################
+function tlvm.SCAN_DEV():string;
+var
+ l:Tstringlist;
+ php:tstringlist;
+ tmpstr:string;
+ RegExpr:TRegExpr;
+ cmd:string;
+ i:integer;
+begin
+ if not FileExists(SYS.LOCATE_LVMDISKSCAN()) then begin
+ logs.Debuglogs('tlvm.SCAN_VG():: Unable to stat lvmdiskscan');
+ exit;
+ end;
+ tmpstr:=logs.FILE_TEMP();
+ cmd:=SYS.LOCATE_LVMDISKSCAN()+' -l >'+tmpstr+' 2>&1';
+ logs.Debuglogs(cmd);
+ fpsystem(cmd);
+ RegExpr:=TRegExpr.Create;
+ l:=Tstringlist.Create;
+ l.LoadFromFile(tmpstr);
+ RegExpr.Expression:='(.+?)\s+.+?\[([0-9A-Z\s]+)\]\s+LVM';
+ php:=Tstringlist.Create;
+ for i:=0 to l.Count-1 do begin
+ if RegExpr.Exec(l.Strings[i]) then begin
+ logs.Debuglogs('Match[1]='+trim(RegExpr.Match[1])+' Match[2]='+trim(RegExpr.Match[2]));
+ php.Add('$lvm_disks["'+trim(RegExpr.Match[1])+'"]["'+trim(RegExpr.Match[2])+'"]=True;');
+ end;
+
+ end;
+
+ result:=php.Text;
+ php.free;
+ l.free;
+ RegExpr.free;
+ logs.DeleteFile(tmpstr);
+
+
+end;
+
+//#############################################################################
+
+
+
function tlvm.STATUS:string;
var
12 bin/src/artica-install/backup/mysql_daemon.pas.bak
View
@@ -575,10 +575,12 @@ var
mysql_user:string;
logpathstring:string;
ldap:topenldap;
+ mysql_install_db:string;
begin
i:=0;
logpathstring:='';
FileTemp:=artica_path+'/ressources/logs/mysql.start.daemon';
+ mysql_install_db:=SYS.LOCATE_GENERIC_BIN('mysql_install_db');
processname:=ExtractFileName(ParamStr(0));
if not FileExists(SYS.LOCATE_mysqld_bin()) then begin
logs.DebugLogs('Starting......: Mysql is not installed, abort');
@@ -647,6 +649,14 @@ ForceDirectories('/var/log/mysql');
datadir:=SERVER_PARAMETERS('datadir');
+ if not FileExists(datadir+'/mysql/host.frm') then begin
+
+ if FileExists(mysql_install_db) then begin
+ logs.Debuglogs('Starting......: Mysql installing default databases.');
+ fpsystem(mysql_install_db);
+ end;
+ end;
+
logbin:=SERVER_PARAMETERS('log_bin');
mysql_user:=SERVER_PARAMETERS('user');
fpsystem('/bin/chmod 777 /tmp');
@@ -1030,7 +1040,7 @@ end;
if SYS.isoverloadedTooMuch() then begin
logs.DebugLogs('Starting......: System is overloaded');
exit;
-end
+end;
if EnableMysqlClusterManager<>1 then begin
logs.DebugLogs('Starting......: Mysql-cluster is not enabled, abort');
8 bin/src/artica-install/backup/postfix_addons.pas.bak
View
@@ -29,6 +29,7 @@ private
public
Debug:boolean;
+ force_to_lmtp:boolean;
constructor Create();
procedure Free;
procedure AddPostfixSettings();
@@ -45,7 +46,7 @@ public
procedure PROCMAIL_MASTER_CF;
procedure PROCMAIL_PROCMAILRC;
procedure REMOVE_MASTER_CF1_OPTIONS(regex1:string);
- force_to_lmtp:boolean;
+
END;
@@ -562,16 +563,11 @@ begin
end;
//###############################################################################
procedure Tpostfix_addon.install_kaspersky_mail_servers();
-var
- install:Tclass_install;
-
-
begin
writeln('INSTALLING KASPERSKY FOR UNIX MAIL SERVERS....');
if FileExists('/usr/bin/dpkg') then KAV_INSTALL_DEBIAN();
if FileExists('/bin/rpm') then KAV_INSTALL_READHAT();
- install:=Tclass_install.Create;
if FileExists('/opt/kav/5.5/kav4mailservers/bin/keepup2date') then begin
writeln('updating av databases please wait for few minutes');
fpsystem('/opt/kav/5.5/kav4mailservers/bin/keepup2date >/tmp/keepUp2Date.log &');
14 bin/src/artica-install/backup/process_infos.pas.bak
View
@@ -39,7 +39,7 @@ private
dnsmasq:tdnsmasq;
SYS:Tsystem;
fetchmail:tfetchmail;
- function ExecPipe(commandline:string;ShowOut:boolean=false):string;
+// function ExecPipe(commandline:string;ShowOut:boolean=false):string;
function MD5FromFile(path:string):string;
function ReadFileIntoString(path:string):string;
function COMMANDLINE_PARAMETERS(FoundWhatPattern:string):boolean;
@@ -47,9 +47,10 @@ private
public
+ Enable_echo:boolean;
procedure Free;
constructor Create;
- Enable_echo:boolean;
+
function get_file_permission(path:string):string;
function ExecPipe2(commandline:string;ShowOut:boolean=false):string;
@@ -116,14 +117,6 @@ begin
ArrDatas.Free;
end;
//##############################################################################
-function Tprocessinfos.ExecPipe(commandline:string;ShowOut:boolean):string;
-begin
-if debug then LOGS.logs('Tprocessinfos.ExecPipe ->' + commandline);
-fpsystem(commandline + ' >/tmp/artica.cmdLines.tmp');
-result:=ReadFileIntoString('/tmp/artica.cmdLines.tmp');
-end;
-//##############################################################################
-
function Tprocessinfos.ExecStream(commandline:string;ShowOut:boolean):TMemoryStream;
const
READ_BYTES = 2048;
@@ -409,7 +402,6 @@ jcheckmail.free;
ccyrus.CYRUS_DAEMON_STOP();
syslogng.STOP();
-zmysql.SERVICE_STOP();
squid.SQUID_STOP();
dansguardian.DANSGUARDIAN_STOP();
15 bin/src/artica-install/backup/zsystem.pas.bak
View
@@ -1856,9 +1856,13 @@ begin
exit;
end;
end;
+ try
ini:=TiniFile.Create('/etc/artica-postfix/versions.cache');
result:=ini.ReadString(APP_NAME,'VERSION','');
- ini.Free;
+ finally
+ ini.Free;
+ end;
+
end;
//#########################################################################################
procedure Tsystem.SET_CACHE_VERSION(APP_NAME:string;version:string);
@@ -4319,8 +4323,15 @@ begin
if FileExists('/usr/sbin/accept') then exit('/usr/sbin/accept');
end;
//#############################################################################
+ function Tsystem.LOCATE_ctl_cyrusdb():string;
+begin
+ if FileExists('/usr/sbin/ctl_cyrusdb') then exit('/usr/sbin/ctl_cyrusdb');
+ if FileExists('/usr/lib/cyrus/bin/ctl_cyrusdb') then exit('/usr/lib/cyrus/bin/ctl_cyrusdb');
+ if FileExists('/usr/lib/cyrus-imapd/ctl_cyrusdb') then exit('/usr/lib/cyrus-imapd/ctl_cyrusdb');
+end;
- function Tsystem.LOCATE_ctl_mboxlist():string;
+ //#############################################################################
+ function Tsystem.LOCATE_ctl_mboxlist():string;
begin
if FileExists('/usr/sbin/ctl_mboxlist') then exit('/usr/sbin/ctl_mboxlist');
12 bin/src/artica-install/class_install.pas
View
@@ -9,7 +9,7 @@ interface
Classes, SysUtils,Process,strutils,IniFiles,RegExpr in 'RegExpr.pas',artica_cron,opengoo,
BaseUnix,unix,global_conf,zsystem,logs,geoip,debian,spamass,openldap,clamav,cyrus,squid,postfix_class,samba,awstats,process_infos,pureftpd,ntpd,spfmilter,
mailgraph_daemon, miltergreylist,lighttpd, roundcube,dansguardian,kav4samba,mimedefang,stunnel4,dkimfilter,kav4proxy,bind9,obm,mysql_daemon,p3scan,syslogng,openvpn,cups,
- jcheckmail,dhcp_server,obm2,dstat,rsync,smartd,tcpip,policyd_weight,apache_artica,autofs,framework,assp,pdns,gluster,nfsserver,zabbix,hamachi,postfilter, vmwaretools,zarafa_server,monit,wifi,
+ jcheckmail,dhcp_server,dstat,rsync,smartd,tcpip,policyd_weight,apache_artica,autofs,assp,pdns,gluster,nfsserver,zabbix,hamachi,postfilter, vmwaretools,zarafa_server,monit,wifi,
mailarchiver in '/home/dtouzeau/developpement/artica-postfix/bin/src/artica-install/mailarchiver.pas',
kas3 in '/home/dtouzeau/developpement/artica-postfix/bin/src/artica-install/kas3.pas',
kavmilter in '/home/dtouzeau/developpement/artica-postfix/bin/src/artica-install/kavmilter.pas',
@@ -581,7 +581,6 @@ function Tclass_install.WichUpdateTools():boolean;
jcheckmail:tjcheckmail;
dhcp3:tdhcp3;
logs:tlogs;
- zobm2:tobm2;
opengoo:topengoo;
cups:tcups;
dtstat:tdstat;
@@ -590,7 +589,6 @@ function Tclass_install.WichUpdateTools():boolean;
policydw:tpolicyd_weight;
autofs:tautofs;
mysql:tmysql_daemon;
- framework:tframework;
assp:tassp;
pdns:tpdns;
gluster:tgluster;
@@ -1254,7 +1252,6 @@ procedure tclass_install.START_SERVICES_PARAMETERS();
dhcp3:tdhcp3;
cron:tcron;
lighttpd:Tlighttpd;
- zobm2:tobm2;
opengoo:topengoo;
cups:tcups;
dstat:tdstat;
@@ -1749,7 +1746,7 @@ procedure tclass_install.START_SERVICES_PARAMETERS();
if ParamStr(2)='daemon' then begin
if not SYS.BuildPids() then exit();
-
+ GLOBAL_INI.SYSTEM_START_MINIMUM_DAEMON();
monit.START();
exit();
end;
@@ -1923,7 +1920,7 @@ procedure tclass_install.START_SERVICES_PARAMETERS();
if ParamStr(2)='all' then begin
fpsystem(GLOBAL_INI.get_ARTICA_PHP_PATH()+'/bin/process1 --force &');
- GLOBAL_INI.SYSTEM_START_ARTICA_DAEMON();
+ GLOBAL_INI.SYSTEM_START_MINIMUM_DAEMON();
GLOBAL_INI.START_ALL_DAEMONS();
fpsystem(SYS.LOCATE_PHP5_BIN() +' ' + GLOBAL_INI.get_ARTICA_PHP_PATH() +'/exec.ldap.rebuild.php >/dev/null &');
exit();
@@ -1944,8 +1941,7 @@ procedure tclass_install.START_SERVICES_PARAMETERS();
fpsystem(GLOBAL_INI.get_ARTICA_PHP_PATH()+'/bin/process1 --force &');
- GLOBAL_INI.SYSTEM_START_ARTICA_DAEMON();
- GLOBAL_INI.SYSTEM_START_ARTICA_ALL_DAEMON();
+ GLOBAL_INI.SYSTEM_START_MINIMUM_DAEMON();
fpsystem(SYS.LOCATE_PHP5_BIN() +' ' + GLOBAL_INI.get_ARTICA_PHP_PATH() +'/exec.ldap.rebuild.php >/dev/null &');
writeln('');
writeln('');
15 bin/src/artica-install/cyrus.pas
View
@@ -112,6 +112,7 @@ Tcyrus=class
procedure CheckRightsAndConfig();
function TestingMailBox(username:string;password:string):string;
procedure MASTER_RECOVER();
+ procedure RECOVER_CYRUS_DB_SINGLE();
//murder
@@ -420,7 +421,21 @@ procedure TCyrus.CreateCyrAdm();
fpsystem(SYS.LOCATE_PHP5_BIN()+ ' ' + artica_path+'/exec.check-cyrus-account.php cyrus & >/dev/null 2>&1 &');
end;
//##############################################################################
+procedure Tcyrus.RECOVER_CYRUS_DB_SINGLE();
+var
+ configdirectory:string;
+begin
+
+
+if FileExists(SYS.LOCATE_ctl_cyrusdb()) then begin
+ CYRUS_DAEMON_STOP();
+ fpsystem('su - cyrus -c "'+SYS.LOCATE_ctl_cyrusdb()+' -r"');
+ CYRUS_DAEMON_START();
+end;
+end;
+
+//##############################################################################
procedure Tcyrus.MASTER_RECOVER();
var
configdirectory:string;
50 bin/src/artica-install/global_conf.pas
View
@@ -5617,7 +5617,7 @@ procedure MyConf.START_ALL_DAEMONS();
end;
-
+ fpsystem('/etc/init.d/artica-postfix start wifi');
logs.Debuglogs('############ gluster ##################');
@@ -10935,7 +10935,6 @@ procedure myconf.MYSQL_CHANGE_ROOT_PASSWORD();
rootExists:boolean;
servername:string;
syslog:tsyslogng;
- logerror:string;
obm:tobm;
count:integer;
mysqld_safe:string;
@@ -10974,7 +10973,6 @@ procedure myconf.MYSQL_CHANGE_ROOT_PASSWORD();
logs:=Tlogs.Create;
tempfile:=logs.FILE_TEMP();
- logerror:=logs.FILE_TEMP();
writeln('Stopping Artica daemon');
fpsystem('/etc/init.d/artica-postfix stop daemon');
@@ -11516,12 +11514,10 @@ procedure myconf.CLEAN_QUARANTINES();
var
ini:string;
- D:Boolean;
pid:string;
begin
//
- D:=SYS.COMMANDLINE_PARAMETERS('--boa-status');
-
+ ini:='';
logs.Debuglogs('starting status BOA');
ini:=ini+ '[BOA]'+CRLF;
ini:=ini+ 'service_name=APP_BOA'+CRLF;
@@ -11552,22 +11548,20 @@ function myconf.LMB_LUNDIMATIN_VERSION():string;
var
ini:string;
- D:Boolean;
pid:string;
begin
-
- D:=SYS.COMMANDLINE_PARAMETERS('--boa-status');
- pid:=BOA_DAEMON_GET_PID();
- logs.Debuglogs('starting status BOA');
- ini:=ini+ '[BOA]'+CRLF;
- if SYS.PROCESS_EXIST(pid) then ini:=ini+ 'running=1'+CRLF else ini:=ini+ 'running=0'+CRLF;
- ini:=ini+ 'application_installed=1'+CRLF;
- ini:=ini+ 'master_pid='+ pid+CRLF;
- ini:=ini+ 'master_memory=' + IntToStr(SYS.PROCESS_MEMORY(pid))+CRLF;
- ini:=ini+ 'master_version=0.94.13'+CRLF;
- ini:=ini+ 'status='+SYS.PROCESS_STATUS(pid)+CRLF;
- ini:=ini+ 'service_name=APP_BOA'+CRLF;
- ini:=ini+ 'service_cmd=boa'+CRLF;
+ ini:='';
+ pid:=BOA_DAEMON_GET_PID();
+ logs.Debuglogs('starting status BOA');
+ ini:=ini+ '[BOA]'+CRLF;
+ if SYS.PROCESS_EXIST(pid) then ini:=ini+ 'running=1'+CRLF else ini:=ini+ 'running=0'+CRLF;
+ ini:=ini+ 'application_installed=1'+CRLF;
+ ini:=ini+ 'master_pid='+ pid+CRLF;
+ ini:=ini+ 'master_memory=' + IntToStr(SYS.PROCESS_MEMORY(pid))+CRLF;
+ ini:=ini+ 'master_version=0.94.13'+CRLF;
+ ini:=ini+ 'status='+SYS.PROCESS_STATUS(pid)+CRLF;
+ ini:=ini+ 'service_name=APP_BOA'+CRLF;
+ ini:=ini+ 'service_cmd=boa'+CRLF;
result:=ini;
end;
//#############################################################################
@@ -11663,7 +11657,6 @@ function myconf.SYSLOGER_STATUS():string;
var
ini:TstringList;
pid:string;
-Enabled:integer;
begin