Added snmp-community to gosa setup

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@7679 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index b5697afd9ea8de7f3654822ee6795c1379768b63..0cdaf16d030e83ae316f3d53c77d8523eaa68de8 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -181,7 +181,7 @@
                <tab class="termstartup" name="Startup" />
                <tab class="termservice" name="Devices" />
                <tab class="terminfo" name="Information" 
-                       snmpcommunity="goto" />
+                       snmpcommunity="{$cv.optional.snmpcommunity}" />
                <tab class="glpiAccount" name="Inventory" />
                <tab class="reference" name="References" />
        </termtabs>
@@ -211,7 +211,7 @@
 <!--   <tab class="servdhcp" name="DHCP" /> -->
 {/if}
                <tab class="terminfo" name="Information" 
-                       snmpcommunity="goto" />
+                       snmpcommunity="{$cv.optional.snmpcommunity}" />
                <tab class="glpiAccount" name="Inventory" />
                <tab class="reference" name="References" />
        </servtabs>
@@ -222,7 +222,7 @@
                <tab class="workservice" name="Devices" />
                <tab class="printgeneric" name="Printer" />
                <tab class="terminfo" name="Information" 
-                       snmpcommunity="goto" />
+                       snmpcommunity="{$cv.optional.snmpcommunity}" />
 {if $cv.enableFAI_management}
                <tab class="faiSummaryTab" name="FAI summary" />
 {else}

diff --git a/setup/class_setupStep_Config3.inc b/setup/class_setupStep_Config3.inc
index 372eb017d805c8e3b7011d8fb376567c672bf28d..6db74ddb3a0db249a1c4a576887f29af18724b96 100644 (file)
--- a/setup/class_setupStep_Config3.inc
+++ b/setup/class_setupStep_Config3.inc
@@ -36,6 +36,7 @@ class Step_Config3 extends setup_step
               "ppd_path" => "/var/spool/ppd/",
               "ppd_path_active" => FALSE,
               "compile" =>  "/var/spool/gosa",
+              "snmpcommunity" =>  "goto",
               "debuglevel" => 0,
               "session_lifetime" => 7200,
               "max_ldap_query_time" => "5.0",
@@ -97,7 +98,7 @@ class Step_Config3 extends setup_step
         }
       }
       
-      foreach(array("list_summary","strict_units","noprimarygroup","forceglobals","forcessl","ldapstats","warnssl","compile","debuglevel","session_lifetime") as $name){
+      foreach(array("list_summary","strict_units","noprimarygroup","forceglobals","forcessl","ldapstats","warnssl","snmpcommunity","compile","debuglevel","session_lifetime") as $name){
         if(isset($_POST[$name])){
           $this->optional[$name] = get_post($name);
         }

diff --git a/setup/setup_config3.tpl b/setup/setup_config3.tpl
index 47c2a42301f7d59faf7ccd6a6e87d756612e9bb4..d92601a6ea811e48e577ce06c53b02206473a0e0 100644 (file)
--- a/setup/setup_config3.tpl
+++ b/setup/setup_config3.tpl
@@ -46,6 +46,15 @@
                                type='text' value='{$optional.compile}'>
         </div>
     </div>
+    <div class='step4_container'>
+        <div class='step4_name'>
+            {t}SNMP community{/t}
+        </div>
+        <div class='step4_value'>
+                       <input size=40 id='compile' name='snmpcommunity' 
+                               type='text' value='{$optional.snmpcommunity}'>
+        </div>
+    </div>
     <div class='step4_container'>
         <div class='step4_name'>
             {t}Path for PPD storage{/t}