Version 0.7.1 changes

CHANGES

@@ -0,0 +1,19 @@
+v0.7.1
+  - Changed default configuration
+  - Fixed SSL bug in PostgreSQL provider
+
+v0.7.0
+
+Change Log:
+  - New configuration validator GUI
+  - New internal configuration engine
+  - SSL support for databases
+  - Unified code for all platforms
+  - Improved code quality & Several bugfixes
+  - Updated MySQL Connector to official v6.9.9
+  - Updated PostgreSQL data provider to v3.1.7
+  - Updated Bootstrap to v3.3.7
+  - Updated jQuery to v2.2.4
+
+
+Changes prior to 0.7.0 is not recorded.

LICENSE

@@ -0,0 +1,163 @@
+===============================================================================
+
+This license file is only needed for binary distribution.
+
+===============================================================================
+
+NTP Analyzer is licensed under the MIT license
+
+Copyright (c) 2013-2016 Carsten Sonne Larsen <cs@innolan.dk>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+===============================================================================
+
+Options function embedded in Ntp.Common is licensed under the MIT license
+
+Copyright (C) 2008 Novell (http://www.novell.com)
+Copyright (C) 2009 Federico Di Gregorio.
+Copyright (C) 2012 Xamarin Inc (http://www.xamarin.com)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+===============================================================================
+
+Bootstrap is licensed under the MIT license
+
+Copyright (c) 2011-2016 Twitter, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+===============================================================================
+
+jQuery is licensed under the MIT license
+
+Copyright jQuery Foundation and other contributors, https://jquery.org/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+===============================================================================
+
+Npgsql is licensed under The PostgreSQL Licence
+
+Copyright (c) 2002-2016, The Npgsql Development Team
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose, without fee, and without a written agreement is
+hereby granted, provided that the above copyright notice and this paragraph and
+the following two paragraphs appear in all copies.
+
+IN NO EVENT SHALL THE NPGSQL DEVELOPMENT TEAM BE LIABLE TO ANY PARTY FOR DIRECT,
+INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE
+NPGSQL DEVELOPMENT TEAM HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+THE NPGSQL DEVELOPMENT TEAM SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND
+THE NPGSQL DEVELOPMENT TEAM HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
+UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+===============================================================================
+
+NPlot is licensed under a 3-clause-BSD license
+
+NPlot - A charting library for .NET Copyright (C) 2003-2006 Matt Howlett
+and others. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+    
+    Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+    
+    Neither the name of NPlot nor the names of its contributors may be used to
+    endorse or promote products derived from this software without specific
+    prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+===============================================================================
+
+MySQL Connector is licensed under GNU General Public License, version 2
+
+===============================================================================

Ntp.Analyzer.Cli/AssemblyInfo.cs

@@ -21,6 +21,6 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.7.0.0")]
+[assembly: AssemblyVersion("0.7.1.0")]
 [assembly: AssemblyCopyright("Copyright (c) 2013-2016 Carsten Sonne Larsen <cs@innolan.dk>")]
 [assembly: AssemblyCulture("")]

Ntp.Analyzer.Data/AssemblyInfo.cs

@@ -22,7 +22,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyVersion("0.7.0.0")]
+[assembly: AssemblyVersion("0.7.1.0")]
 [assembly: AssemblyCopyright("Copyright (c) 2013-2016 Carsten Sonne Larsen <cs@innolan.dk>")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]

Ntp.Analyzer.Import/AssemblyInfo.cs

@@ -22,7 +22,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyVersion("0.7.0.0")]
+[assembly: AssemblyVersion("0.7.1.0")]
 [assembly: AssemblyCopyright("Copyright (c) 2013-2016 Carsten Sonne Larsen <cs@innolan.dk>")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]

Ntp.Analyzer.Monitor.Cli/AssemblyInfo.cs

@@ -21,6 +21,6 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.7.0.0")]
+[assembly: AssemblyVersion("0.7.1.0")]
 [assembly: AssemblyCopyright("Copyright (c) 2013-2016 Carsten Sonne Larsen <cs@innolan.dk>")]
 [assembly: AssemblyCulture("")]

Ntp.Analyzer.Monitor.Client/AssemblyInfo.cs

@@ -21,6 +21,6 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.7.0.0")]
+[assembly: AssemblyVersion("0.7.1.0")]
 [assembly: AssemblyCopyright("Copyright (c) 2013-2016 Carsten Sonne Larsen <cs@innolan.dk>")]
 [assembly: AssemblyCulture("")]

Ntp.Analyzer.Monitor.Server/AssemblyInfo.cs

@@ -21,6 +21,6 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.7.0.0")]
+[assembly: AssemblyVersion("0.7.1.0")]
 [assembly: AssemblyCopyright("Copyright (c) 2013-2016 Carsten Sonne Larsen <cs@innolan.dk>")]
 [assembly: AssemblyCulture("")]

Ntp.Analyzer.Objects/AssemblyInfo.cs

@@ -21,6 +21,6 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.7.0.0")]
+[assembly: AssemblyVersion("0.7.1.0")]
 [assembly: AssemblyCopyright("Copyright (c) 2013-2016 Carsten Sonne Larsen <cs@innolan.dk>")]
 [assembly: AssemblyCulture("")]

Ntp.Analyzer.Process/AssemblyInfo.cs

@@ -22,7 +22,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyVersion("0.7.0.0")]
+[assembly: AssemblyVersion("0.7.1.0")]
 [assembly: AssemblyCopyright("Copyright (c) 2013-2016 Carsten Sonne Larsen <cs@innolan.dk>")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]

Ntp.Analyzer.Validate.Cli/AssemblyInfo.cs

@@ -21,6 +21,6 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.7.0.0")]
+[assembly: AssemblyVersion("0.7.1.0")]
 [assembly: AssemblyCopyright("Copyright (c) 2013-2016 Carsten Sonne Larsen <cs@innolan.dk>")]
 [assembly: AssemblyCulture("")]

Ntp.Analyzer.Validate.Gui/AssemblyInfo.cs

@@ -21,6 +21,6 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.7.0.0")]
+[assembly: AssemblyVersion("0.7.1.0")]
 [assembly: AssemblyCopyright("Copyright (c) 2013-2016 Carsten Sonne Larsen <cs@innolan.dk>")]
 [assembly: AssemblyCulture("")]

Ntp.Analyzer/AssemblyInfo.cs

@@ -22,7 +22,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyVersion("0.7.0.0")]
+[assembly: AssemblyVersion("0.7.1.0")]
 [assembly: AssemblyCopyright("Copyright (c) 2013-2016 Carsten Sonne Larsen <cs@innolan.dk>")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]

Ntp.Analyzer/Common/VersionInfo.cs

@@ -23,7 +23,7 @@ namespace Ntp.Analyzer.Common
 {
     public static class VersionInfo
     {
-        public static readonly string Number = "0.7.0";
+        public static readonly string Number = "0.7.1";
 
         public static readonly string Text = "v" + Number;
     }

Ntp.Analyzer/Ntp.Analyzer.csproj

@@ -30,9 +30,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NPlot, Version=0.9.10.0, Culture=neutral, PublicKeyToken=4eda430eb4395eb1, processorArchitecture=MSIL">
+    <Reference Include="NPlot">
       <HintPath>..\packages\NPlot.0.9.10.0\lib\net20\NPlot.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

Ntp.Common/AssemblyInfo.cs

@@ -22,7 +22,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyVersion("0.7.0.0")]
+[assembly: AssemblyVersion("0.7.1.0")]
 [assembly: AssemblyCopyright("Copyright (c) 2013-2016 Carsten Sonne Larsen <cs@innolan.dk>")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]

Ntp.Common/Ntp.Common.csproj

@@ -30,7 +30,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Mono.Posix, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+    <Reference Include="Mono.Posix">
       <HintPath>..\packages\Mono.Posix.4.0.0.0\lib\net40\Mono.Posix.dll</HintPath>
       <Private>True</Private>
     </Reference>

Ntp.Data.Provider/AssemblyInfo.cs

@@ -21,6 +21,6 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.7.0.0")]
+[assembly: AssemblyVersion("0.7.1.0")]
 [assembly: AssemblyCopyright("Copyright (c) 2013-2016 Carsten Sonne Larsen <cs@innolan.dk>")]
 [assembly: AssemblyCulture("")]

Ntp.Data.Provider/Ntp.Data.Provider.csproj

@@ -58,13 +58,11 @@
     <When Condition=" '$(MySql)' == 'ON' " />
   </Choose>
   <ItemGroup>
-    <Reference Include="MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+    <Reference Include="MySql.Data">
       <HintPath>..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll</HintPath>
-      <Private>True</Private>
     </Reference>
-    <Reference Include="Npgsql, Version=3.1.7.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
+    <Reference Include="Npgsql">
       <HintPath>..\packages\Npgsql.3.1.7\lib\net451\Npgsql.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />

Ntp.Data.Provider/PostgreSqlFactory.cs

@@ -157,12 +157,10 @@ namespace Ntp.Data.Provider
 
             if (Config.EnableSsl)
             {
-                b.Append(@"SSL=true;");
                 b.Append(@"SslMode=Require;");
             }
             else
             {
-                b.Append(@"SSL=false;");
                 b.Append(@"SslMode=Disable;");
             }
 

Ntp.Data/AssemblyInfo.cs

@@ -21,6 +21,6 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.7.0.0")]
+[assembly: AssemblyVersion("0.7.1.0")]
 [assembly: AssemblyCopyright("Copyright (c) 2013-2016 Carsten Sonne Larsen <cs@innolan.dk>")]
 [assembly: AssemblyCulture("")]

examples/ntpa.conf

@@ -1,6 +1,4 @@
-
 Database {
-
     # Uncomment if you want to use PostgreSQL
     # Provider PostgreSQL
     Provider MySql
@@ -14,12 +12,6 @@ Database {
     User ntpau
     Pass "password"
     
-    # Uncomment to automatically create all tables and data
-    # Create Yes
-    
-    # Uncomment to automatically upgrade database schema
-    # Upgrade Yes
-    
     # Uncomment to change connection timeout
     # ConnectionTimeout 60
     
@@ -34,10 +26,36 @@ Database {
     
     # Uncomment to override connection settings
     # ConnectionString "Server=myServerAddress;Database=myDataBase;Uid=myUsername;Pwd=myPassword;"
+    
+    # Uncomment to automatically create all tables and data
+    # New systems should enable this setting when creating a new database
+    # Create Yes
+    
+    # Uncomment to automatically upgrade database schema
+    # Upgrade Yes
 }
 
+# Uncomment to change permission settings for generated files
+# Permission {
+#     Mode 644
+#     User www
+#     Group ntpa
+# }
+
 Log {
     File /var/log/ntpa/ntpa.log
+    
+    # Uncomment to hide severity level in log messages
+    # ShowSeverity No
+    
+    # Uncomment to hide timestamps in log messages
+    # ShowTimestamp No
+    
+    # Uncomment to show log messages with severity debug
+    # Severity Debug
+    
+    # Uncomment to change default time stamp in log messages
+    # TimeFormat "MM-dd-yyyy HH:mm:ss"
 }
 
 # Uncomment to give more details in Syslog (default severity in syslog is Notice)
@@ -77,6 +95,9 @@ Server {
     HostAddress 127.0.0.1
     FilePath "/usr/local/www/ntpa"
     
+    # Uncomment to use ntpctl instead of ntpq for readings
+    # HostType Ntpctl
+    
     # Uncomment to change base URL for generated files and links
     # WebPath /ntpa
     
@@ -92,46 +113,6 @@ Server {
         Frequency stat1
     }
     
-    Menu {
-        
-        Item title {
-            Type Link
-            Caption example.net
-            Link http://example.net
-        }
-        
-        Item main {
-            Type Page
-            Caption NTP
-            Page ntp1
-        }
-        
-        Item {
-            Type Page
-            Caption About
-            Page about1
-        }
-    }
-    
-    AboutPage about1 {
-        PageTitle "example.net"
-        Link /about.html
-        ContentTitle "ntp1.example.net"
-        
-        # Uncomment to generate a link to support.ntp.org
-        # ServerID 999
-        
-        Content { 
-            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-            Sed et risus vel leo interdum fringilla. Vestibulum ex justo,
-            euismod ac conat tempor a massa. Donec elementum congue.</p>
-        }
-        
-        Destinations {
-            File about.html
-        }
-    }
-    
     HostPage ntp1 {
         PageTitle "ntp1.example.net"
         
@@ -139,10 +120,13 @@ Server {
         # Template Default
         Template Bootstrap
         
+        # Uncomment to use local time in host page. Only supported if database is also using local time
+        # PageTime Local
+        
         PeerPages ntp1-peers
         Link /index.html
         
-        # Uncomment to fetch peer status directly from NTP Deamon instead of from database
+        # Uncomment to fetch peer status directly from NTP servers instead of from database
         # QueryDirect Yes
         
         # Uncomment to generate a link to pool.ntp.org
@@ -179,10 +163,28 @@ Server {
         Frequency 15
         InitialRun Yes
         Title "ntp1.example.net (1 day)"
+        
+        # Uncomment to show a 7 days graph
+        # Timespan 7
         Timespan 1
+        
+        # Uncomment to generate a graph with 512 pixels width
+        # Width 512
+        
+        # Uncomment to generate a graph with 320 pixels height
+        # Height 320
+        
         Jitter 1
         Offset 1
-        GFrequency 1
+        
+        # Uncomment to show deviation (stability) in graph
+        # Stability 1
+        
+        # Uncomment to show frequency for the kernel phase-locked loop (PLL)
+        # GFrequency 1
+        
+        # Uncomment to remove readings which divert more than factor 4 from average
+        # FilterFactor 4
         
         Destinations {
             File ntp1.png
@@ -264,6 +266,46 @@ Server {
         }
     }
     
+    Menu {
+        
+        Item title {
+            Type Link
+            Caption example.net
+            Link http://example.net
+        }
+        
+        Item main {
+            Type Page
+            Caption NTP
+            Page ntp1
+        }
+        
+        Item {
+            Type Page
+            Caption About
+            Page about1
+        }
+    }
+    
+    AboutPage about1 {
+        PageTitle "example.net"
+        Link /about.html
+        ContentTitle "ntp1.example.net"
+        
+        # Uncomment to generate a link to support.ntp.org
+        # ServerID 999
+        
+        Content {
+            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+            Sed et risus vel leo interdum fringilla. Vestibulum ex justo,
+            euismod ac conat tempor a massa. Donec elementum congue.</p>
+        }
+        
+        Destinations {
+            File about.html
+        }
+    }
+    
     HostGraphPage graphpages1 {
         InitialRun Yes
         Frequency 0

lib/ntpa.rc

@@ -1,7 +1,5 @@
 #!/bin/sh
 #
-# $FreeBSD$
-#
 # PROVIDE: ntpa
 # REQUIRE: networking
 # KEYWORD: shutdown
@@ -10,7 +8,7 @@
 #
 # ntpa_enable (bool):   Set to NO by default.
 #                       Set it to YES to enable ntpa.
-# ntpa_config (path):   Set to %%PREFIX%%/etc/ntpa/ntpa.conf
+# ntpa_config (path):   Set to /usr/local/etc/ntpa/ntpa.conf
 #                       by default.
 # ntpa_tempdir (path):  Set to /tmp by default.
 # ntpa_user (user):     Set to ntpa by default.
@@ -48,14 +46,14 @@ rcvar=${name}_enable
 start_cmd=ntpa_start
 stop_cmd=ntpa_stop
 reload_cmd=ntpa_reload
-conftest_cmd=ntpa_conftest
+configtest_cmd=ntpa_configtest
 
-extra_commands=reload,conftest
+extra_commands="reload configtest"
 
 load_rc_config ${name}
 
 eval ": \${${name}_enable:=\"NO\"}"
-eval ": \${${name}_config:=\"%%PREFIX%%/etc/ntpa/${name}.conf\"}"
+eval ": \${${name}_config:=\"/usr/local/etc/ntpa/${name}.conf\"}"
 eval ": \${${name}_tempdir:=\"/tmp/\"}"
 eval ": \${${name}_user:=\"ntpa\"}"
 
@@ -65,7 +63,6 @@ ntpauser="$(eval echo \${${name}_user})"
 
 pid_dir=/var/run/ntpa
 pidfile="$pid_dir/${name}.pid"
-ntpctl_sock="/var/lib/openntpd/run/ntpd.sock"
 
 ntpa_start()
 {
@@ -73,20 +70,21 @@ ntpa_start()
         install -m 0775 -g $ntpauser -o $ntpauser -d "$pid_dir"
     fi
 
-    if [ -f ${ntpctl_sock} ]; then
-        chown root:ntpa ${ntpctl_sock}
-    fi
-
     if [ -f ${pidfile} ]; then
         rc_pid=`cat ${pidfile}`
         echo 1>&2 "${name} already running? (pid=$rc_pid)."
         return 1
     else
         echo "Starting ${name}."
-        su -m ${ntpauser} -c "sh -c '%%PREFIX%%/sbin/ntpa --config ${config} --writepid ${pidfile} --temp ${tempdir} --daemon ${name} &'"
+        su -m ${ntpauser} -c "sh -c '/usr/local/sbin/ntpa --config ${config} --writepid ${pidfile} --temp ${tempdir} --daemon ${name} &'"
     fi
 }
 
+ntpa_configtest()
+{
+    su -m ${ntpauser} -c "sh -c '/usr/local/sbin/ntpav -v ${config}'"
+}
+
 ntpa_reload()
 {
     if [ ! -f ${pidfile} ]; then
@@ -99,11 +97,6 @@ ntpa_reload()
     fi
 }
 
-ntpa_conftest()
-{
-    su -m ${ntpauser} -c "sh -c '%%PREFIX%%/sbin/ntpav -v ${config}'"
-}
-
 ntpa_stop()
 {
     if [ ! -f ${pidfile} ]; then

lib/ntpac

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec mono "./Ntp.Monitor.Cli.exe" "$@"
+exec mono "./Ntp.Analyzer.Monitor.Cli.exe" "$@"

lib/ntpag

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec mono "./Ntp.Analyzer.Validate.Gui.exe" "$@"

packages/repositories.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<repositories>
+  <repository path="../Ntp.Analyzer/packages.config" />
+  <repository path="../Ntp.Common/packages.config" />
+  <repository path="../Ntp.Data.Provider/packages.config" />
+</repositories>