diff --git a/RUJEL/Configuration/RUJELsetup/meta/database.plist b/RUJEL/Configuration/RUJELsetup/meta/database.plist
index 15f7cc8..b708dc1 100644
--- a/RUJEL/Configuration/RUJELsetup/meta/database.plist
+++ b/RUJEL/Configuration/RUJELsetup/meta/database.plist
@@ -15,7 +15,7 @@
presets
dbpresets
defaultpreset
- MySQL через сеть
+ MySQL через socket
status
required
keys
diff --git a/RUJEL/Configuration/SiteConfig.xml b/RUJEL/Configuration/SiteConfig.xml
index f405aad..0606fe3 100644
--- a/RUJEL/Configuration/SiteConfig.xml
+++ b/RUJEL/Configuration/SiteConfig.xml
@@ -17,7 +17,7 @@
NO
NO
HelloWorld
- /opt/apple/Local/Library/WebObjects/Applications/HelloWorld.woa/HelloWorld
+ /usr/share/java/webobjects/Local/Library/WebObjects/Applications/HelloWorld.woa/HelloWorld
16
NO
NO
@@ -25,7 +25,7 @@
8
30
180
- /opt/apple/Local/Library/WebObjects/Logs
+ /var/log/webobjects
30
0
128
@@ -35,6 +35,7 @@
2010
YES
-WODirectConnectEnabled NO
+-CONFIGDIR /etc/webobjects
-PASSWORD 123
-ALLOWED_IPS .
WODefaultAdaptor
@@ -42,7 +43,7 @@
NO
NO
PListWOEditor
- /opt/apple/Local/Library/WebObjects/Applications/PListWOEditor.woa/PListWOEditor
+ /usr/share/java/webobjects/Local/Library/WebObjects/Applications/PListWOEditor.woa/PListWOEditor
16
NO
NO
@@ -50,7 +51,7 @@
8
30
910
- /opt/apple/Local/Library/WebObjects/Logs
+ /var/log/webobjects
30
0
128
@@ -60,13 +61,14 @@
2020
YES
-WODirectConnectEnabled NO
--Xms64m -Xmx128m
+-Xms64m -Xmx128m
+-CONFIGDIR /etc/webobjects/rujel
WODefaultAdaptor
()
NO
NO
Rujel
- /opt/apple/Local/Library/WebObjects/Applications/Rujel.woa/Rujel
+ /usr/share/java/webobjects/Local/Library/WebObjects/Applications/Rujel.woa/Rujel
16
NO
NO
@@ -74,7 +76,7 @@
8
30
910
- /opt/apple/Local/Library/WebObjects/Logs
+ /var/log/webobjects
30
0
128
@@ -83,13 +85,14 @@
256
2040
YES
- -WODirectConnectEnabled NO
+ -CONFIGDIR /etc/webobjects/rujel
+-WODirectConnectEnabled NO
WODefaultAdaptor
()
NO
NO
RujelDiary
- /opt/apple/Local/Library/WebObjects/Applications/RujelDiary.woa/RujelDiary
+ /usr/share/java/webobjects/Local/Library/WebObjects/Applications/RujelDiary.woa/RujelDiary
16
NO
NO
@@ -97,7 +100,7 @@
8
30
3600
- /opt/apple/Local/Library/WebObjects/Logs
+ /var/log/webobjects
30
0
128
@@ -108,8 +111,8 @@
2001
YES
-ShowDebug true
- /opt/apple/Local/Library/WebObjects/Applications/HelloWorld.woa/HelloWorld
- /opt/apple/Local/Library/WebObjects/Logs/HelloWorld-1
+ /usr/share/java/webobjects/Local/Library/WebObjects/Applications/HelloWorld.woa/HelloWorld
+ /var/log/webobjects/HelloWorld-1
3
3
NO
@@ -131,10 +134,11 @@
2010
YES
-WODirectConnectEnabled NO
+-CONFIGDIR /etc/webobjects
-PASSWORD 123
-ALLOWED_IPS .
- /opt/apple/Local/Library/WebObjects/Applications/PListWOEditor.woa/PListWOEditor
- /opt/apple/Local/Library/WebObjects/Logs/PListWOEditor-1
+ /usr/share/java/webobjects/Local/Library/WebObjects/Applications/PListWOEditor.woa/PListWOEditor
+ /var/log/webobjects/PListWOEditor-1
3
3
NO
@@ -158,11 +162,12 @@
1
-WODirectConnectEnabled NO
-Xms64m -Xmx128m
+-CONFIGDIR /etc/webobjects/rujel
-EMailBroadcast.disableWeekly true
-AutoItog.disable true
-PlanFactCheck.disable true
- /opt/apple/Local/Library/WebObjects/Applications/Rujel.woa/Rujel
- /opt/apple/Local/Library/WebObjects/Logs/Rujel-1
+ /usr/share/java/webobjects/Local/Library/WebObjects/Applications/Rujel.woa/Rujel
+ /var/log/webobjects/Rujel-1
3
NO
NO
@@ -183,9 +188,10 @@
2040
YES
1
- -WODirectConnectEnabled NO
- /opt/apple/Local/Library/WebObjects/Applications/RujelDiary.woa/RujelDiary
- /opt/apple/Local/Library/WebObjects/Logs/RujelDiary-1
+ -CONFIGDIR /etc/webobjects/rujel
+-WODirectConnectEnabled NO
+ /usr/share/java/webobjects/Local/Library/WebObjects/Applications/RujelDiary.woa/RujelDiary
+ /var/log/webobjects/RujelDiary-1
3
NO
NO
diff --git a/RUJEL/Configuration/logging/diaryLog.properties b/RUJEL/Configuration/logging/diaryLog.properties
index 2e4729d..f872c0c 100644
--- a/RUJEL/Configuration/logging/diaryLog.properties
+++ b/RUJEL/Configuration/logging/diaryLog.properties
@@ -29,7 +29,7 @@ handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler
# "%u" a unique number to resolve conflicts
# "%%" translates to a single percent sign "%"
-java.util.logging.FileHandler.pattern = /Library/WebObjects/Logs/RujelDiary%u_%g.log
+java.util.logging.FileHandler.pattern = /var/log/webobjects/RujelDiary%u_%g.log
java.util.logging.FileHandler.limit = 262144
java.util.logging.FileHandler.count = 5
java.util.logging.FileHandler.formatter = net.rujel.reusables.WOLogFormatter
diff --git a/RUJEL/Configuration/logging/logging.properties b/RUJEL/Configuration/logging/logging.properties
index d467c00..6d47d15 100644
--- a/RUJEL/Configuration/logging/logging.properties
+++ b/RUJEL/Configuration/logging/logging.properties
@@ -29,7 +29,7 @@ handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler
# "%u" a unique number to resolve conflicts
# "%%" translates to a single percent sign "%"
-java.util.logging.FileHandler.pattern = /Library/WebObjects/Logs/Rujel%u_%g.log
+java.util.logging.FileHandler.pattern = /var/log/webobjects/Rujel%u_%g.log
java.util.logging.FileHandler.limit = 262144
java.util.logging.FileHandler.count = 10
java.util.logging.FileHandler.formatter = net.rujel.reusables.WOLogFormatter