Remove start tracker and start dbus afp.conf options, GitHub #1618

Author: rdmark

contrib/webmin_module/edit_global_section.cgi

@@ -469,16 +469,6 @@ print &ui_table_row($text{'edit_global_section_spotlight_expr'},
 	&build_select($afpconfRef, $sectionRef, \%in, 'spotlight expr', $text{'edit_undefined'}, 'yes', 'yes', 'no', 'no')
 );
 
-@values = get_parameter_of_section($afpconfRef, $sectionRef, 'start dbus', \%in);
-print &ui_table_row($text{'edit_global_section_start_dbus'},
-	&build_select($afpconfRef, $sectionRef, \%in, 'start dbus', $text{'edit_undefined'}, 'yes', 'yes', 'no', 'no')
-);
-
-@values = get_parameter_of_section($afpconfRef, $sectionRef, 'start tracker', \%in);
-print &ui_table_row($text{'edit_global_section_start_tracker'},
-	&build_select($afpconfRef, $sectionRef, \%in, 'start tracker', $text{'edit_undefined'}, 'yes', 'yes', 'no', 'no')
-);
-
 @values = get_parameter_of_section($afpconfRef, $sectionRef, 'veto message', \%in);
 print &ui_table_row($text{'edit_global_section_veto_message'},
 	&build_select($afpconfRef, $sectionRef, \%in, 'veto message', $text{'edit_undefined'}, 'yes', 'yes', 'no', 'no')

contrib/webmin_module/lang/en

@@ -235,8 +235,6 @@ edit_global_section_sparql_results_limit_default=default: unlimited
 edit_global_section_spotlight_attributes=Allowed Spotlight attributes (comma-separated)
 edit_global_section_spotlight_attributes_default=all
 edit_global_section_spotlight_expr=Spotlight logic expressions
-edit_global_section_start_dbus=Start D-Bus
-edit_global_section_start_tracker=Start Tracker
 edit_global_section_veto_message=Send AFP messages for vetoed files
 edit_global_section_vol_dbnest=Store CNID database on AFP volume
 edit_global_section_volnamelen=Max volume name length

contrib/webmin_module/netatalk-lib.pl

@@ -78,8 +78,6 @@
 	'splice size'				=> '65536',
 	'spotlight'					=> 'yes',
 	'spotlight expr'			=> 'yes',
-	'start dbus'				=> 'yes',
-	'start tracker'				=> 'yes',
 	'stat vol'					=> 'yes',
 	'time machine'				=> 'no',
 	'uam list'					=> 'uams_dhx.so uams_dhx2.so',

doc/ja/manpages/man5/afp.conf.5.xml

@@ -1027,27 +1027,6 @@
           </listitem>
         </varlistentry>
 
-        <varlistentry>
-          <term>start dbus = <replaceable>BOOLEAN</replaceable> (デフォルト:
-          <emphasis>yes</emphasis>) <type>(G)</type></term>
-
-          <listitem>
-            <para>Tracker もしくは LocalSearch を使うためにdbusインスタンスを開始するかどうか。</para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>start tracker = <replaceable>BOOLEAN</replaceable> (デフォルト:
-          <emphasis>yes</emphasis>) <type>(G)</type></term>
-
-          <listitem>
-            <para>"<command>tracker daemon -s</command>"、
-            "<command>localsearch daemon -s</command>" によって Tracker もしくは
-            LocalSearch を開始するかどうか。古いTrackerの場合、"<command>tracker-control
-            -s</command>"が代わりに使われる。</para>
-          </listitem>
-        </varlistentry>
-
         <varlistentry>
           <term>veto message = <replaceable>BOOLEAN</replaceable> (デフォルト:
           <emphasis>no</emphasis>) <type>(G)</type></term>

doc/manpages/man5/afp.conf.5.xml

@@ -1193,28 +1193,6 @@
           </listitem>
         </varlistentry>
 
-        <varlistentry>
-          <term>start dbus = <replaceable>BOOLEAN</replaceable> (default:
-          <emphasis>yes</emphasis>) <type>(G)</type></term>
-
-          <listitem>
-            <para>Whether to start a dbus instance for use with Tracker or
-            LocalSearch.</para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>start tracker = <replaceable>BOOLEAN</replaceable> (default:
-          <emphasis>yes</emphasis>) <type>(G)</type></term>
-
-          <listitem>
-            <para>Whether to start Tracker or LocalSearch with
-            "<command>tracker daemon -s</command>" or "<command>localsearch
-            daemon -s</command>". In case of old Tracker,
-            "<command>tracker-control -s</command>" is used instead.</para>
-          </listitem>
-        </varlistentry>
-
         <varlistentry>
           <term>veto message = <replaceable>BOOLEAN</replaceable> (default:
           <emphasis>no</emphasis>) <type>(G)</type></term>

etc/netatalk/netatalk.c

@@ -488,24 +488,20 @@ int main(int argc, char **argv)
         setenv("XDG_CACHE_HOME", _PATH_STATEDIR, 0);
         setenv("TRACKER_USE_LOG_FILES", "1", 0);
 
-        if (atalk_iniparser_getboolean(obj.iniconfig, INISEC_GLOBAL, "start dbus", 1)) {
-            dbus_path = atalk_iniparser_getstring(obj.iniconfig, INISEC_GLOBAL, "dbus daemon", DBUS_DAEMON_PATH);
-            LOG(log_note, logtype_default, "Starting dbus: %s", dbus_path);
-            if ((dbus_pid = run_process(dbus_path, "--config-file=" _PATH_CONFDIR "dbus-session.conf", NULL)) == NETATALK_SRV_ERROR) {
-                LOG(log_error, logtype_default, "Error starting '%s'", dbus_path);
-                netatalk_exit(EXITERR_CONF);
-            }
-
-            /* Allow dbus some time to start up */
-            sleep(1);
+        dbus_path = atalk_iniparser_getstring(obj.iniconfig, INISEC_GLOBAL, "dbus daemon", DBUS_DAEMON_PATH);
+        LOG(log_note, logtype_default, "Starting dbus: %s", dbus_path);
+        if ((dbus_pid = run_process(dbus_path, "--config-file=" _PATH_CONFDIR "dbus-session.conf", NULL)) == NETATALK_SRV_ERROR) {
+            LOG(log_error, logtype_default, "Error starting '%s'", dbus_path);
+            netatalk_exit(EXITERR_CONF);
         }
 
+        /* Allow dbus some time to start up */
+        sleep(1);
+
         set_sl_volumes();
 
-        if (atalk_iniparser_getboolean(obj.iniconfig, INISEC_GLOBAL, "start tracker", 1)) {
-            LOG(log_note, logtype_default, "Starting indexer: " INDEXER_COMMAND " -s");
-            system(INDEXER_COMMAND " -s");
-        }
+        LOG(log_note, logtype_default, "Starting indexer: " INDEXER_COMMAND " -s");
+        system(INDEXER_COMMAND " -s");
     }
 #endif