Updated gofon macro parsing

[gosa.git] / contrib / gosa.conf

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 47b863218c219a67ee514b40fbb518efcbcd637f..34e94316a8483c890e29ea8e978962b3c50c632a 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -170,12 +170,18 @@
                <tab class="reference" name="References" />
        </macrotabs>
 
+<!--
+       <arpnewdevicetabs>
+               <tab class="ArpNewDevice" name="Generic" />
+       </arpnewdevicetabs>
+-->
+
        <termtabs>
                <tab class="termgeneric" name="Generic" />
                <tab class="termstartup" name="Startup" />
                <tab class="termservice" name="Devices" />
-               <tab class="printgeneric" name="Printer" />
-               <tab class="terminfo" name="Information" />
+               <tab class="terminfo" name="Information" 
+                       snmpcommunity="{$cv.optional.snmpcommunity}" />
                <tab class="glpiAccount" name="Inventory" />
                <tab class="reference" name="References" />
        </termtabs>
@@ -204,7 +210,8 @@
 {else}
 <!--   <tab class="servdhcp" name="DHCP" /> -->
 {/if}
-               <tab class="terminfo" name="Information" />
+               <tab class="terminfo" name="Information" 
+                       snmpcommunity="{$cv.optional.snmpcommunity}" />
                <tab class="glpiAccount" name="Inventory" />
                <tab class="reference" name="References" />
        </servtabs>
@@ -214,7 +221,8 @@
                <tab class="workstartup" name="Startup" />
                <tab class="workservice" name="Devices" />
                <tab class="printgeneric" name="Printer" />
-               <tab class="terminfo" name="Information" />
+               <tab class="terminfo" name="Information" 
+                       snmpcommunity="{$cv.optional.snmpcommunity}" />
 {if $cv.enableFAI_management}
                <tab class="faiSummaryTab" name="FAI summary" />
 {else}
@@ -282,11 +290,13 @@
                <tab class="webdavAccount" />
                <tab class="phpgwAccount" />
                <tab class="intranetAccount" />
+<!--
                <tab class="opengwAccount"
                        username="OGo"
                        password=""
                        database="OGo"
                        datahost="localhost" />
+-->
 <!--   
                <tab class="pptpAccount" /> 
                <tab class="phpscheduleitAccount" /> 
@@ -376,7 +386,7 @@
                pwdiffer="{$cv.pwd_rules.pwdiffer}"
 {/if}
 {if $cv.pwd_rules.externalpwdhook_active}
-               pwdiffer="{$cv.pwd_rules.externalpwdhook}"
+               externalpwdhook="{$cv.pwd_rules.externalpwdhook}"
 {/if}
 {if $cv.errorlvl}
                displayerrors="true"
@@ -444,6 +454,11 @@
                        groups="{$cv.groupou}"
                        gidbase="{$cv.uidbase}"
                        uidbase="{$cv.uidbase}"
+{if $cv.optional.auth_mail}
+                       auth_mail="true"
+{else}
+                       auth_mail="false"
+{/if}
 {if $cv.optional.strict_units}
                        strict_units="true"
 {else}
@@ -491,6 +506,7 @@
 {else}
                        cyrusunixstyle="false"
 {/if}
+                       mail_uattrib="{$cv.mail_attrib}"
 {if $cv.mail_settings.vacationdir_active}
                        vacationdir="{$cv.mail_settings.vacationdir}"
 {/if}
@@ -517,6 +533,8 @@
 {/if}
 {if $cv.samba_version != 0}
                        sambaversion="{$cv.samba_version}"
+{else}
+                       sambaversion="3"
 {/if}
                        config="ou=gosa,ou=configs,ou=systems,{$cv.base}">
 
@@ -524,11 +542,5 @@
                                admin="{$cv.admin}"
                                password="{$cv.password}" />
                </location>
-
-               <faxformat type="pdf" />
-               <faxformat type="ps" />
-               <faxformat type="png" />
-               <faxformat type="mtiff" />
-               <faxformat type="tiff" />
        </main>
 </conf>