From 3945a3710985642238f01b45bb6900c9ad3d3f6f Mon Sep 17 00:00:00 2001 From: cajus Date: Wed, 7 Jun 2006 19:14:10 +0000 Subject: [PATCH] Quick review for new service handling - new images - typo fixing - layout fixing git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3677 594d385d-05f5-0310-b6e9-bd551577e9d8 --- contrib/openldap/goserver.schema | 205 ++++++++++++++++-- html/images/status_restart.png | Bin 574 -> 941 bytes html/images/status_restart_all.png | Bin 574 -> 941 bytes html/images/status_restarting.png | Bin 574 -> 463 bytes html/images/status_running.png | Bin 661 -> 829 bytes html/images/status_start.png | Bin 661 -> 911 bytes html/images/status_start_all.png | Bin 661 -> 911 bytes html/images/status_stop.png | Bin 745 -> 856 bytes html/images/status_stop_all.png | Bin 745 -> 856 bytes html/images/status_stopped.png | Bin 745 -> 459 bytes plugins/admin/systems/ServiceAddDialog.tpl | 21 +- .../systems/class_divListSystemService.inc | 1 + plugins/admin/systems/class_goFaxServer.inc | 2 +- plugins/admin/systems/class_goFonServer.inc | 2 +- plugins/admin/systems/class_goGlpiServer.inc | 2 +- plugins/admin/systems/class_goImapServer.inc | 2 +- plugins/admin/systems/class_goKrbServer.inc | 2 +- plugins/admin/systems/class_goLdapServer.inc | 2 +- plugins/admin/systems/class_goMailServer.inc | 2 +- plugins/admin/systems/class_goNtpServer.inc | 2 +- plugins/admin/systems/class_goShareServer.inc | 2 +- .../admin/systems/class_goSyslogServer.inc | 2 +- plugins/admin/systems/goFaxServer.tpl | 2 +- plugins/admin/systems/goFonServer.tpl | 1 + plugins/admin/systems/goGlpiServer.tpl | 3 +- plugins/admin/systems/goImapServer.tpl | 3 +- plugins/admin/systems/goKrbServer.tpl | 2 +- plugins/admin/systems/goLdapServer.tpl | 5 +- plugins/admin/systems/goLogDBServer.tpl | 2 +- plugins/admin/systems/goMailServer.tpl | 5 +- plugins/admin/systems/goShareServer.tpl | 2 +- plugins/admin/systems/goTerminalServer.tpl | 3 +- 32 files changed, 222 insertions(+), 53 deletions(-) diff --git a/contrib/openldap/goserver.schema b/contrib/openldap/goserver.schema index b469f6b58..7cbc94007 100644 --- a/contrib/openldap/goserver.schema +++ b/contrib/openldap/goserver.schema @@ -168,6 +168,178 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.9.32 NAME 'goGlpiDatabase' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.33 NAME 'goTerminalServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.34 NAME 'goNfsServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.35 NAME 'goNtpServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.36 NAME 'goSyslogServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.37 NAME 'goLdapServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.38 NAME 'goImapServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.39 NAME 'goKrbServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.40 NAME 'goFaxServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.41 NAME 'goLogDBServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.42 NAME 'goFonServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.43 NAME 'goShareServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.44 NAME 'goMailServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.45 NAME 'goGlpiServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.46 NAME 'postfixHeaderSizeLimit' + DESC 'Keep postfix header-size-limit variable' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.47 NAME 'postfixMailboxSizeLimit' + DESC 'Keep postfix mailbox-size-limit variable' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.48 NAME 'postfixMessageSizeLimit' + DESC 'Keep postfix message-size-limit variable' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.49 NAME 'postfixMyDestinations' + DESC 'Keep postfix mydestinations variable' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.50 NAME 'postfixMyDomain' + DESC 'Keep postfix mydomain variable' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.51 NAME 'postfixMyHostname' + DESC 'Keep postfix myhostname variable' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.52 NAME 'postfixMyNetworks' + DESC 'Keep postfix mynetworks variable' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.53 NAME 'postfixRelayhost' + DESC 'Keep postfix relayhost variable' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.54 NAME 'postfixTransportTable' + DESC 'Keep postfix transport tables' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.55 NAME 'postfixSenderRestrictions' + DESC 'Keep postfix sender restrictions' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.56 NAME 'postfixRecipientRestrictions' + DESC 'Keep postfix transport tables' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.57 NAME 'cyrusImap' + DESC 'Start IMAP service? true/false' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.58 NAME 'cyrusImapSSL' + DESC 'Start IMAP SSL service? true/false' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.59 NAME 'cyrusPop3' + DESC 'Start POP3 service? true/false' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.60 NAME 'cyrusPop3SSL' + DESC 'Start POP3 SSL service? true/false' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + +attributetype ( 1.3.6.1.4.1.10098.1.1.9.61 NAME 'goCupsServerStatus' + DESC 'Server status container - on / off / fail' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE) + + ## ## Objectclasses ## @@ -176,55 +348,56 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.9.32 NAME 'goGlpiDatabase' objectclass (1.3.6.1.4.1.10098.1.2.1.16 NAME 'goTerminalServer' SUP top AUXILIARY DESC 'Terminal server description (v2.4)' MUST ( cn $ goXdmcpIsEnabled $ goFontPath ) - MAY ( description )) + MAY ( description $ goTerminalServerStatus )) # NFS Server description objectclass (1.3.6.1.4.1.10098.1.2.1.19 NAME 'goNfsServer' SUP top AUXILIARY DESC 'NFS server description (v2.4)' MUST ( cn ) - MAY ( goExportEntry $ description )) + MAY ( goExportEntry $ description $ goNfsServerStatus )) # Time Server description objectclass (1.3.6.1.4.1.10098.1.2.1.20 NAME 'goNtpServer' SUP top AUXILIARY DESC 'Time server description (v2.4)' MUST ( cn ) - MAY ( goTimeSource $ description )) + MAY ( goTimeSource $ description $ goNtpServerStatus )) # Syslog Server description objectclass (1.3.6.1.4.1.10098.1.2.1.21 NAME 'goSyslogServer' SUP top AUXILIARY DESC 'Syslog server description (v2.4)' MUST ( cn ) - MAY ( goSyslogSection $ description )) + MAY ( goSyslogSection $ description $ goSyslogServerStatus )) # LDAP Server description objectclass (1.3.6.1.4.1.10098.1.2.1.22 NAME 'goLdapServer' SUP top AUXILIARY DESC 'LDAP server description (v2.4)' MUST ( cn ) - MAY ( goLdapBase $ description )) + MAY ( goLdapBase $ description $ goLdapServerStatus )) # CUPS Server description objectclass (1.3.6.1.4.1.10098.1.2.1.23 NAME 'goCupsServer' SUP top AUXILIARY DESC 'CUPS server description (v2.4)' MUST ( cn ) - MAY ( description )) + MAY ( description $ goCupsServerStatus )) # IMAP Server description objectclass (1.3.6.1.4.1.10098.1.2.1.24 NAME 'goImapServer' SUP top AUXILIARY DESC 'IMAP server description (v2.4)' MUST ( cn $ goImapName $ goImapConnect $ goImapAdmin $ goImapPassword ) - MAY ( goImapSieveServer $ goImapSievePort $ description )) + MAY ( goImapSieveServer $ goImapSievePort $ description $ goImapServerStatus $ + cyrusImap $ cyrusImapSSL $ cyrusPop3 $ cyrusPop3SSL )) # Kerberos Server description objectclass (1.3.6.1.4.1.10098.1.2.1.25 NAME 'goKrbServer' SUP top AUXILIARY DESC 'Kerberos server description (v2.4)' MUST ( cn $ goKrbRealm $ goKrbAdmin $ goKrbPassword ) - MAY ( description )) + MAY ( description $ goKrbServerStatus )) # Fax Server description objectclass (1.3.6.1.4.1.10098.1.2.1.26 NAME 'goFaxServer' SUP top AUXILIARY DESC 'Fax server description (v2.4)' MUST ( cn $ goFaxAdmin $ goFaxPassword ) - MAY ( description )) + MAY ( description $ goFaxServerStatus )) # Common server class objectclass (1.3.6.1.4.1.10098.1.2.1.27 NAME 'goServer' SUP top AUXILIARY @@ -235,28 +408,32 @@ objectclass (1.3.6.1.4.1.10098.1.2.1.27 NAME 'goServer' SUP top AUXILIARY # LogDB Server description objectclass (1.3.6.1.4.1.10098.1.2.1.28 NAME 'goLogDBServer' SUP top AUXILIARY DESC 'Log DB server description (v2.4)' - MUST ( cn $ goLogAdmin $ goLogPassword )) + MUST ( cn $ goLogAdmin $ goLogPassword $ goLogDBServerStatus )) # Fon Server description objectclass (1.3.6.1.4.1.10098.1.2.1.29 NAME 'goFonServer' SUP top AUXILIARY DESC 'Fon server description (v2.4)' MUST ( cn $ goFonAdmin $ goFonPassword $ goFonAreaCode $ goFonCountryCode ) - MAY ( description )) + MAY ( description $ goFonServerStatus )) # Share Server description objectclass (1.3.6.1.4.1.10098.1.2.1.33 NAME 'goShareServer' SUP top AUXILIARY DESC 'Share server description (v2.4)' MUST ( cn ) - MAY ( description $ goExportEntry )) + MAY ( description $ goExportEntry $ goShareServerStatus )) # Mail Server description objectclass (1.3.6.1.4.1.10098.1.2.1.36 NAME 'goMailServer' SUP top AUXILIARY DESC 'Mail server definition (v2.4)' MUST ( cn ) - MAY ( description ) ) + MAY ( description $ goMailServerStatus $ postfixHeaderSizeLimit $ + postfixMailboxSizeLimit $ postfixMessageSizeLimit $ + postfixMydestinations $ postfixMydomain $ postfixMyhostname $ + postfixMynetworks $ postfixRelayhost $ postfixTransportTable $ + postfixSenderRestrictions $ postfixRecipientRestrictions ) ) # Glpi Server description objectclass (1.3.6.1.4.1.10098.1.2.1.37 NAME 'goGlpiServer' SUP top AUXILIARY DESC 'Glpi server definition (v2.4)' MUST ( cn $ goGlpiAdmin $ goGlpiDatabase) - MAY ( description $ goGlpiPassword) ) + MAY ( description $ goGlpiPassword $ goGlpiServerStatus ) ) diff --git a/html/images/status_restart.png b/html/images/status_restart.png index de65ee190afe13189d11ccc121b7252dbce6ea21..99fd4d7c1f0b8d94b51f6bfdc96079f165b3b4aa 100644 GIT binary patch delta 927 zcmV;Q17Q5V1g!@liBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZyne+>Wt z3k?D72f!=<000McNliru)&>U?G#*7^OEv%i13F1WK~y-)U6adeTy-49&-eGbGjnfd zGI>lpX~qWtKR}m8N!+?{Q4paniqICJCLzU` z*VJZW8#~iv-go9ce)sotAq?VKf1mT&oO1~O)7-*(2Ea66Pl2caYXPedfnn|-W4gB<52{)3nU zK=G|xXQWDf_4aK3^3BUba%Pgq5iwvitT9L_!ih13vr~$L#IYwebFQb|l_J|b;ByNr z8DjF*RMETf!9`b&dH}N#a;`wmQxKfshZdb)0wSQ0lX%uZuGZ9kh@syYtesA$)U~ab zA%`HcSbN+>wGl&bAczuVU5Vp)g*zJ(4=OH&NG3ScSpnjOw1V3U6EH53btSg;L;O+c z!&r-PFTyJmS)44o7|SZGJp}>{fT=Vwep~=RFXq@gQkWbUAP^4Pe;mJ*vv_0D$EVke zgU*ey&;}qP5CLQjXR!LP9k5=d(5Nb%$fNocnZSM+Z;1$a@k8b&Z3%MmEi$6AK;n!J=-+!rHw&_BOdC?Op;U2#OPGM}6zJ4mVuAe|wakJm;&ct9bRoyGNlG zk2-xj!x##~p5Oo|)<9w`h%EYHg3bMI_;~;5k@7dcn4q{*>&B? z)ZLwMXJ+T|>!9?VKfcSS%H`hxf0)jzP>MH;J&B(mi6s;#yp)*0LquqW5y6`g5jQL1 z?v>VT@|QPF53F|=|HRH#r3$*?Vvh+|?uY&|axah1z_3#cm=r9!2 z+6+2vfFBXA`j%McJ!jgS+%9-^qS^}HVv?v4lN#;L7zfkmoh^L`KtKN$fAX~Zi7Ho* z5_=IMu=Qh)wg=|V3=R%r?mLhn4m;UhD`2!6I15SUtt(^`os5s4MxC0882$Tzi`m;^ zWufubBv$PNp2dgEU8Uy=n#x*(&!2j!7a=_qV5D69+*R`VJo;R63AO7it&U?@DIedC zsH_k0b#uR})#{k;i|Z@_e{Dxzq7Q4n&ncXd8>&Mm@cky{)YL7In2y))+5FOCwsC^7 zt~5#+*!C*AzrUZpt`^eRpe=Wqv59NSvJ#X^1r`?GfrzmAY*I@1hosqbSzfNt*Ovo! wW>u@}IB}1}Cm$)>-oSM|hKG*>+q3=w!Oi2UE$EYR00000NkvXX1g=70f}zR)F8}}l diff --git a/html/images/status_restart_all.png b/html/images/status_restart_all.png index de65ee190afe13189d11ccc121b7252dbce6ea21..99fd4d7c1f0b8d94b51f6bfdc96079f165b3b4aa 100644 GIT binary patch delta 927 zcmV;Q17Q5V1g!@liBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZyne+>Wt z3k?D72f!=<000McNliru)&>U?G#*7^OEv%i13F1WK~y-)U6adeTy-49&-eGbGjnfd zGI>lpX~qWtKR}m8N!+?{Q4paniqICJCLzU` z*VJZW8#~iv-go9ce)sotAq?VKf1mT&oO1~O)7-*(2Ea66Pl2caYXPedfnn|-W4gB<52{)3nU zK=G|xXQWDf_4aK3^3BUba%Pgq5iwvitT9L_!ih13vr~$L#IYwebFQb|l_J|b;ByNr z8DjF*RMETf!9`b&dH}N#a;`wmQxKfshZdb)0wSQ0lX%uZuGZ9kh@syYtesA$)U~ab zA%`HcSbN+>wGl&bAczuVU5Vp)g*zJ(4=OH&NG3ScSpnjOw1V3U6EH53btSg;L;O+c z!&r-PFTyJmS)44o7|SZGJp}>{fT=Vwep~=RFXq@gQkWbUAP^4Pe;mJ*vv_0D$EVke zgU*ey&;}qP5CLQjXR!LP9k5=d(5Nb%$fNocnZSM+Z;1$a@k8b&Z3%MmEi$6AK;n!J=-+!rHw&_BOdC?Op;U2#OPGM}6zJ4mVuAe|wakJm;&ct9bRoyGNlG zk2-xj!x##~p5Oo|)<9w`h%EYHg3bMI_;~;5k@7dcn4q{*>&B? z)ZLwMXJ+T|>!9?VKfcSS%H`hxf0)jzP>MH;J&B(mi6s;#yp)*0LquqW5y6`g5jQL1 z?v>VT@|QPF53F|=|HRH#r3$*?Vvh+|?uY&|axah1z_3#cm=r9!2 z+6+2vfFBXA`j%McJ!jgS+%9-^qS^}HVv?v4lN#;L7zfkmoh^L`KtKN$fAX~Zi7Ho* z5_=IMu=Qh)wg=|V3=R%r?mLhn4m;UhD`2!6I15SUtt(^`os5s4MxC0882$Tzi`m;^ zWufubBv$PNp2dgEU8Uy=n#x*(&!2j!7a=_qV5D69+*R`VJo;R63AO7it&U?@DIedC zsH_k0b#uR})#{k;i|Z@_e{Dxzq7Q4n&ncXd8>&Mm@cky{)YL7In2y))+5FOCwsC^7 zt~5#+*!C*AzrUZpt`^eRpe=Wqv59NSvJ#X^1r`?GfrzmAY*I@1hosqbSzfNt*Ovo! wW>u@}IB}1}Cm$)>-oSM|hKG*>+q3=w!Oi2UE$EYR00000NkvXX1g=70f}zR)F8}}l diff --git a/html/images/status_restarting.png b/html/images/status_restarting.png index de65ee190afe13189d11ccc121b7252dbce6ea21..e0021413b72bcc3786e1fa3c16be41281e6da806 100644 GIT binary patch literal 463 zcmV;=0WkiFP)c z)6a{}Q5XgA&-pgq86_bpW9LUPOUlAn*(m>mEMz66lvv0gp~=EdrkL!kY$!V`OI9{) z#P|`ThS6g&_s#Xb^VHM#);;IkbDwj+s>)W45f*U+qsjdl6P08ZCmLxtf{iI$Qy-HK z;~aKk4zumMh8K8RRexZZ5c+_1Y->Ggy&o5FGs$R*SXJNg0IMCT??qgPA<4cZ2a_C1 zGE~(X?%`bnFXK(;;%t(I;39Ul``l@#YL+fx1)p#mXWE^g4cOkPt#`J6Rn<~eeXPw1 zKJRcxhc>ZMJMq}$*t>e!4eZE(FP+lKY}Vc+*IK6I+R?;E*a!~bO0ztNw|IriZGEe% zek7T}=|)^lRY`Ilry8*jeh%+(wW>b%zQ;K}#B0;RkFbFIN#>`BRrMQ7c!aMVX)H94 z<2~`ew+cxHJi#8D@vLCEs=oEOslUU&Jn!OhRsGxo<1fBBg}{C&i+un9002ovPDHLk FV1nwa&v*a; literal 574 zcmV-E0>S->P){*>&B?)ZLwMXJ+T|>!9?VKfcSS%H`hxn9i$EiZ_criJu>d zB@`#Tl$gLnL}-N(!J82gH!I@qmDX(Xmp4rkKnGDwuvJBjKZv0T>p>hfP}JN#?C9 zWD}i?kDo@Jnu!?w`+$qt+hS#*@zx|(?F631hs<52=L(w2T7%D@dZ`y7JrrQ1T>RWs z^7%aaTyhDu>nyE~V^}F4-;SuP5Abz!zpB;hnC^?~ECFptUZM|czRxL~ksGQ*C-D6y z=G4?JkeH6w@7es)VzzODv92^q8QAtJy1&1lzOEM1*q|+UnX!p$%CZuaN(B}c-hqg) z`D{{3_lKm}bXi`m(ASp(c4k$p>o{?b#3vsq+up!+J%)#m1KYFy0m04Vsx9b~aR2}S M07*qoM6N<$f?x&&GXMYp diff --git a/html/images/status_running.png b/html/images/status_running.png index 543710fb7b9b2a3ea9a115031cec06748ba82d8e..8d72794dd0f14442b856ab4aca6b23edcb8c5d4f 100755 GIT binary patch delta 752 zcmVK1V1t` zvNG_%ga85vZhrvKwZHzqyUN1I^@o9hnFHv8|7b1%2J*Kb4F5hoV)*-?0q#720D>Fv z{WC+y%PU`-Bm^!oFtD&QFfcJ9G=t0n8Tj`n!{hUR7`}aE=z&QA1P~M41%DW(KRw5A z{_AU?3s`_&`S%5Z{{u1WSBB3o{xCc^$#5R1b^=TvKz{(i4fxN<@aFqFhK?5(foz}y z7Mh&M`wX?_m-gp7>#dW`Tzn5ZouDvKv%OdtbcKaVb9kOKmk6eA-oXw zm-h?|&rUJyVP)ufR(!s}@EI6=7yh9|4nP30phOc$Kg<6kw;yQT zzA{hL=;g~73?DyzX88W&Cj@iwGXNlf;0B!5EQJN55r@IuRz{6 zApQ=-e?T%o%m&1)NNg4;pN&D8jh!KxnVCTsAb?mH{xWO?YN!SZZ^vsD$fy4pq<~}+ zP<`63KMX$@Sr|eA0*Hy}FVk;U4%WpCzZo2HYW&3@3?$11WPb$qNy2$KxMJBFnU4;Vs#;@5z-CNRh|BrsYrnzNa*F?=}r zf#K`+ud5lD8Gq6kI2b;_>;MQLMurpyF`&Zj3~Ey z;tfE&g<%2%7efOBFT+Q0fO0S}Fmf?400a;VFkoIW++jGya2;rXI#42Z zU|^UE46;)U{S533l|bA7q6ZN`05Jjm!@%%`;WWb~pnoLD1?)h~4a5(Dcoq=v18V%w zP=-x22mk~S3&Uq1`Iq4s!v&zT^?=?1#q$%evwtw$X2=5?Hk$!Yasvn;7O=U08EybI zU1fLyG~gH5zwdz&RSfj=dza_o;XL-GTcY>uz0gSwJ?YJ`Adzs+`o{{2SW>3{0XFBZm3r99_KY0C2?3D27v zfV8JLH=g3%K=a^VJ`wx%EI0;!dA#KNWI==aPw^m67e|$YA zRv)RAl@(rn>%)T}wkqwenU<1bq0drnKNdR&5w0z;ErU)pf9-aH>a%*q={)&-RQ$SN z5plLoKK0SuO{*cMURO@$df`;+@?gI`n)d7zfZvOHwZmYqaoAjNg00(QVr9|gs8KGL z^$B2ZZVo_Jc|YG31G5@u#$YyK=Xv_LAga4Sr(7-@fPVlLhhWt9@K5gm O0000*6Rm>4Jo00G3pIDt`?;Sa-OhOa>0 zHz58F#D73CK+FcjtVnDYD4&f%nT?$xnVFeE7a)LG82&PB1b=F%1`2P-YZb_+{}`lz zWD-z)+OIzhKNwjULIDDZiRmxXZ&nW0#SFh09C2#=#UKnM%LQZv_DRY}HUnMxh~X!L z6Hx3TKmalQ|MY*Au$HhehaATuh93-;42(#ce=~>!U6{cl&2m)QSGt2=mS6qV?N{4@ zn!|wVo`9491b-0A{}2C9zx(m-7gGq648uEyr3?=kLV)7efVL(u$TK7`S}~flnX)l_ zIQfC$>-Mj!8JHQ;7&sU{!0Z4BAV!811~H(*?Fy}ryoF%`0~bRB124lzaDZ|!Ffej4FaQJ)3ou|_F@M})IK^-sXn;CUBAh{)feDBu z!Cqisme;IB7 zHC<(R0d+Ls7udh=fe}><^z(cM0%;W>fLOr({0GE8fsQ=}ObgE$UIR790aM)$lqkgk z00M{^7+efsh5vz0e$HUd@Cg_%EDU?VVk}5W8JT8=uo;1DfB<5oG&ceS5XHF>Aiw~_ WQH%7`RUtM20000za_o;XL-GTcY>uz0gSwJ?YJ`Adzs+`o{{2SW>3{0XFBZm3r99_KY0C2?3D27v zfV8JLH=g3%K=a^VJ`wx%EI0;!dA#KNWI==aPw^m67e|$YA zRv)RAl@(rn>%)T}wkqwenU<1bq0drnKNdR&5w0z;ErU)pf9-aH>a%*q={)&-RQ$SN z5plLoKK0SuO{*cMURO@$df`;+@?gI`n)d7zfZvOHwZmYqaoAjNg00(QVr9|gs8KGL z^$B2ZZVo_Jc|YG31G5@u#$YyK=Xv_LAga4Sr(7-@fPVlLhhWt9@K5gm O0000*6Rm>4Jo00G3pIDt`?;Sa-OhOa>0 zHz58F#D73CK+FcjtVnDYD4&f%nT?$xnVFeE7a)LG82&PB1b=F%1`2P-YZb_+{}`lz zWD-z)+OIzhKNwjULIDDZiRmxXZ&nW0#SFh09C2#=#UKnM%LQZv_DRY}HUnMxh~X!L z6Hx3TKmalQ|MY*Au$HhehaATuh93-;42(#ce=~>!U6{cl&2m)QSGt2=mS6qV?N{4@ zn!|wVo`9491b-0A{}2C9zx(m-7gGq648uEyr3?=kLV)7efVL(u$TK7`S}~flnX)l_ zIQfC$>-Mj!8JHQ;7&sU{!0Z4BAV!811~H(*?Fy}ryoF%`0~bRB124lzaDZ|!Ffej4FaQJ)3ou|_F@M})IK^-sXn;CUBAh{)feDBu z!Cqisme;IB7 zHC<(R0d+Ls7udh=fe}><^z(cM0%;W>fLOr({0GE8fsQ=}ObgE$UIR790aM)$lqkgk z00M{^7+efsh5vz0e$HUd@Cg_%EDU?VVk}5W8JT8=uo;1DfB<5oG&ceS5XHF>Aiw~_ WQH%7`RUtM200006nP)U?G%@b5c5eUx0_90W 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 B#B=}v literal 745 zcmVz@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA zFaQARU;qF*m;eA5Z<1fdMgRZ;Ur9tkRCwBA{Qv(y10y3N13Ea(z!1Qus94WyXJ^2~ z$H(vwD0YA8(gV)#-Z{e5fb@a@KmZ{as0J9^wX^&G|Mcnq|IeI(3~%0GV4aW?&}aDg z_c_D`Nci!qR}5bn7$$-ZzybgQ2yBRM;k6I%-hQ3P!StEootZF(As>N(oDPgJ1{?q& zfZ(z7?=QoI=NFHC;Bhf$c*pt?VF=I_-+%mIzy|;V2yTc)^|cSLUjHg&`gE7!S)d*R z!~6GO{OQXVh8sVBZop>9eahW)b`80PmPr3rMsAPf*d z7=~;v)l7J_G3x*RNg?+c2mqKN00D$G1MX|kzW?rg$N%}M8VST00uVr0ll`kVe+xg{ zI?kYGWmnHY1ONyitS$k8omFc4U!Q9FKRHIdfsji80*DEhg2ykJ8c*yv% -
- {t}Add a new service to this server.{/t}. -
+
 
+
+ {t}Adding a new service to the current server{/t}

-

-{t}This dialog allows you to add new services to the currenty edited server object. In the box below you can see all available services, services you have already in use are not shown.{/t} +

+{t}This dialog allows you to add new services to the currenty edited server object. The box below shows all available but not already used services.{/t}

{if $Services} - -
- -{t}Please choose a service listed below.{/t} -

-
{t}Available services{/t}   +
{t}Service to add{/t}   {else}
- {t}There are no more services available, if you think that there is a service missing. Please check your gosa configuration file.{/t} + {t}All available services are already in use.{/t}
{/if}

+

diff --git a/plugins/admin/systems/class_divListSystemService.inc b/plugins/admin/systems/class_divListSystemService.inc index 8fdac79e8..722c2d418 100644 --- a/plugins/admin/systems/class_divListSystemService.inc +++ b/plugins/admin/systems/class_divListSystemService.inc @@ -49,6 +49,7 @@ class divListSystemService extends MultiSelectWindow $listhead = "
". "  ". + "  ". "  ". " DisplayName = _("FAX database"); + $this->DisplayName = _("FAX service"); } diff --git a/plugins/admin/systems/class_goFonServer.inc b/plugins/admin/systems/class_goFonServer.inc index 221b5c714..750940fe6 100644 --- a/plugins/admin/systems/class_goFonServer.inc +++ b/plugins/admin/systems/class_goFonServer.inc @@ -28,7 +28,7 @@ class goFonServer extends plugin{ function goFonServer($config,$dn) { plugin::plugin($config,$dn); - $this->DisplayName = _("Asterisk management"); + $this->DisplayName = _("VoIP service"); } diff --git a/plugins/admin/systems/class_goGlpiServer.inc b/plugins/admin/systems/class_goGlpiServer.inc index c532e3523..36bc52c5c 100644 --- a/plugins/admin/systems/class_goGlpiServer.inc +++ b/plugins/admin/systems/class_goGlpiServer.inc @@ -27,7 +27,7 @@ class goGlpiServer extends plugin{ function goGlpiServer($config,$dn) { plugin::plugin($config,$dn); - $this->DisplayName = _("Glpi database"); + $this->DisplayName = _("Inventory database"); } diff --git a/plugins/admin/systems/class_goImapServer.inc b/plugins/admin/systems/class_goImapServer.inc index ebf9fbb4c..a10c71505 100644 --- a/plugins/admin/systems/class_goImapServer.inc +++ b/plugins/admin/systems/class_goImapServer.inc @@ -46,7 +46,7 @@ class goImapServer extends plugin{ { plugin::plugin($config,$dn); - $this->DisplayName = _("Cyrus service"); + $this->DisplayName = _("IMAP/POP3 service"); $this->Actions = array( SERVICE_STOPPED=>SERVICE_STOPPED, SERVICE_STARTED => SERVICE_STARTED, diff --git a/plugins/admin/systems/class_goKrbServer.inc b/plugins/admin/systems/class_goKrbServer.inc index eaed327bc..544568728 100644 --- a/plugins/admin/systems/class_goKrbServer.inc +++ b/plugins/admin/systems/class_goKrbServer.inc @@ -26,7 +26,7 @@ class goKrbServer extends plugin{ function goKrbServer($config,$dn) { plugin::plugin($config,$dn); - $this->DisplayName = _("Kerberos kadmin access informations"); + $this->DisplayName = _("Kerberos service"); } diff --git a/plugins/admin/systems/class_goLdapServer.inc b/plugins/admin/systems/class_goLdapServer.inc index eb29ad2c9..21f5866a2 100644 --- a/plugins/admin/systems/class_goLdapServer.inc +++ b/plugins/admin/systems/class_goLdapServer.inc @@ -24,7 +24,7 @@ class goLdapServer extends plugin{ function goLdapServer($config,$dn) { plugin::plugin($config,$dn); - $this->DisplayName = _("LDAP Service"); + $this->DisplayName = _("LDAP service"); } diff --git a/plugins/admin/systems/class_goMailServer.inc b/plugins/admin/systems/class_goMailServer.inc index 49a2eb2c6..6a596d97e 100644 --- a/plugins/admin/systems/class_goMailServer.inc +++ b/plugins/admin/systems/class_goMailServer.inc @@ -42,7 +42,7 @@ class goMailServer extends plugin{ function goMailServer($config,$dn) { plugin::plugin($config,$dn); - $this->DisplayName = _("Postfix service"); + $this->DisplayName = _("Mail service (SMTP)"); $this->Actions = array( SERVICE_STOPPED=>SERVICE_STOPPED, SERVICE_STARTED => SERVICE_STARTED, diff --git a/plugins/admin/systems/class_goNtpServer.inc b/plugins/admin/systems/class_goNtpServer.inc index 694f6e694..264d56b62 100644 --- a/plugins/admin/systems/class_goNtpServer.inc +++ b/plugins/admin/systems/class_goNtpServer.inc @@ -24,7 +24,7 @@ class goNtpServer extends plugin{ function goNtpServer($config,$dn) { plugin::plugin($config,$dn); - $this->DisplayName = _("NTP Service"); + $this->DisplayName = _("Time service"); /* Load arrays */ $tmp = array(); diff --git a/plugins/admin/systems/class_goShareServer.inc b/plugins/admin/systems/class_goShareServer.inc index f960acdc9..b3156643f 100644 --- a/plugins/admin/systems/class_goShareServer.inc +++ b/plugins/admin/systems/class_goShareServer.inc @@ -28,7 +28,7 @@ class goShareServer extends plugin{ { plugin::plugin($config,$dn); - $this->DisplayName = _("Shares"); + $this->DisplayName = _("File service"); $tmp =array(); if(isset($this->attrs['goExportEntry'])){ diff --git a/plugins/admin/systems/class_goSyslogServer.inc b/plugins/admin/systems/class_goSyslogServer.inc index 66fafcbe2..5cffb0f0e 100644 --- a/plugins/admin/systems/class_goSyslogServer.inc +++ b/plugins/admin/systems/class_goSyslogServer.inc @@ -23,7 +23,7 @@ class goSyslogServer extends plugin{ function goSyslogServer($config,$dn) { plugin::plugin($config,$dn); - $this->DisplayName = _("Syslog service"); + $this->DisplayName = _("Logging service"); } diff --git a/plugins/admin/systems/goFaxServer.tpl b/plugins/admin/systems/goFaxServer.tpl index 6211415aa..1c21ca4fc 100644 --- a/plugins/admin/systems/goFaxServer.tpl +++ b/plugins/admin/systems/goFaxServer.tpl @@ -1,4 +1,4 @@ -{t}Kerberos kadmin access{/t} +

{t}FAX database information{/t}

diff --git a/plugins/admin/systems/goFonServer.tpl b/plugins/admin/systems/goFonServer.tpl index a937131de..f303abb8a 100644 --- a/plugins/admin/systems/goFonServer.tpl +++ b/plugins/admin/systems/goFonServer.tpl @@ -1,3 +1,4 @@ +

{t}VoIP database information{/t}

{t}FAX DB user{/t}
diff --git a/plugins/admin/systems/goGlpiServer.tpl b/plugins/admin/systems/goGlpiServer.tpl index 5b3bc33f7..2cdec6554 100644 --- a/plugins/admin/systems/goGlpiServer.tpl +++ b/plugins/admin/systems/goGlpiServer.tpl @@ -1,5 +1,4 @@ -{t}Glpi database{/t} - +

{t}GLPI database information{/t}

{t}Asterisk DB user{/t}
diff --git a/plugins/admin/systems/goImapServer.tpl b/plugins/admin/systems/goImapServer.tpl index 41b6331ab..ca78a7b2e 100644 --- a/plugins/admin/systems/goImapServer.tpl +++ b/plugins/admin/systems/goImapServer.tpl @@ -1,5 +1,4 @@ -{t}Generic{/t} -
+

{t}Generic{/t}

{t}Logging DB user{/t}
diff --git a/plugins/admin/systems/goKrbServer.tpl b/plugins/admin/systems/goKrbServer.tpl index a829140fe..8227b54b9 100644 --- a/plugins/admin/systems/goKrbServer.tpl +++ b/plugins/admin/systems/goKrbServer.tpl @@ -1,4 +1,4 @@ -{t}Kerberos kadmin access{/t} +

{t}Kerberos kadmin access{/t}

diff --git a/plugins/admin/systems/goLdapServer.tpl b/plugins/admin/systems/goLdapServer.tpl index b2c984303..112ddd6c2 100644 --- a/plugins/admin/systems/goLdapServer.tpl +++ b/plugins/admin/systems/goLdapServer.tpl @@ -1,6 +1,5 @@ -{t}LDAP Service{/t} - - +

{t}LDAP service{/t}

+{t}Base{/t}

 

diff --git a/plugins/admin/systems/goLogDBServer.tpl b/plugins/admin/systems/goLogDBServer.tpl index 88346956e..9bf18aa9b 100644 --- a/plugins/admin/systems/goLogDBServer.tpl +++ b/plugins/admin/systems/goLogDBServer.tpl @@ -1,4 +1,4 @@ -{t}Logging database{/t} +

{t}Logging database information{/t}

{t}Kerberos Realm{/t}
diff --git a/plugins/admin/systems/goMailServer.tpl b/plugins/admin/systems/goMailServer.tpl index cedb73e1c..00d39b6ae 100644 --- a/plugins/admin/systems/goMailServer.tpl +++ b/plugins/admin/systems/goMailServer.tpl @@ -1,8 +1,7 @@ -{t}Generic{/t} -

+

{t}Generic{/t}

{t}Logging DB user{/t}
-
+
{t}Visible full qualified hostname{/t} diff --git a/plugins/admin/systems/goShareServer.tpl b/plugins/admin/systems/goShareServer.tpl index 592379333..1699407db 100644 --- a/plugins/admin/systems/goShareServer.tpl +++ b/plugins/admin/systems/goShareServer.tpl @@ -1,4 +1,4 @@ -{t}Shares{/t} +

{t}Shares{/t}

diff --git a/plugins/admin/systems/goTerminalServer.tpl b/plugins/admin/systems/goTerminalServer.tpl index a0b88fb55..ebe86e949 100644 --- a/plugins/admin/systems/goTerminalServer.tpl +++ b/plugins/admin/systems/goTerminalServer.tpl @@ -1,5 +1,4 @@ -{t}Terminal Service{/t} - +

{t}Terminal service{/t}

-- 2.30.2