updated sample config file

diff --git a/extra/motioneye.conf.sample b/extra/motioneye.conf.sample
index 56f44142f0476c2c9f9137ae25e810659b6bffa3..aff425bf178e7ae7ce5a85cf2f3cc3b0960d8029 100644 (file)
--- a/extra/motioneye.conf.sample
+++ b/extra/motioneye.conf.sample
@@ -2,62 +2,62 @@
 # static files (.css, .js etc) are served at this root url;
 # change this if you run motionEye behind a reverse proxy (e.g. nginx),
 # and you want static files to be served directly by it
-#static_url '/static/'
+static_url /static/
 
 # path to the configuration directory (must be writable by motionEye)
-#conf_path /etc/motioneye
+conf_path /etc/motioneye
 
 # path to the directory where pid files go (must be writable by motionEye)
-#run_path /var/run
+run_path /var/run
 
 # path to the directory where log files go (must be writable by motionEye)
-#log_path /var/log
+log_path /var/log
 
 # default output path for media files (must be writable by motionEye)
-#media_path /var/lib/motioneye
+media_path /var/lib/motioneye
 
-# path to the motion binary to use (automatically detected by default)
+# path to the motion binary to use (automatically detected if commented)
 #motion_binary /usr/bin/motion
 
 # the log level (use quiet, error, warning, info or debug)
-#log_level info
+log_level info
 
 # the IP address to listen on
 # (0.0.0.0 for all interfaces, 127.0.0.1 for localhost)
-#listen 0.0.0.0
+listen 0.0.0.0
 
 # the TCP port to listen on
-#port 8765
+port 8765
 
 # interval in seconds at which motionEye checks the SMB mounts
-#mount_check_interval 300
+mount_check_interval 300
 
 # interval in seconds at which motionEye checks if motion is running
-#motion_check_interval 10
+motion_check_interval 10
 
 # interval in seconds at which the janitor is called
 # to remove old pictures and movies
-#cleanup_interval 43200
+cleanup_interval 43200
 
 # interval in seconds at which the thumbnail mechanism runs
 # (set to 0 to disable) 
-#thumbnailer_interval 60
+thumbnailer_interval 60
 
 # timeout in seconds to wait for response from a remote motionEye server
-#remote_request_timeout 10
+remote_request_timeout 10
 
 # timeout in seconds to wait for mjpg data from the motion daemon
-#mjpg_client_timeout 10
+mjpg_client_timeout 10
 
 # timeout in seconds after which an idle mjpg client is removed
 # (set to 0 to disable)
-#mjpg_client_idle_timeout 10
+mjpg_client_idle_timeout 10
 
 # enable SMB shares (requires motionEye to run as root) 
-#smb_shares false
+smb_shares false
 
 # the directory where the SMB mount points will be created
-#smb_mount_root /media
+smb_mount_root /media
 
 # path to the wpa_supplicant.conf file
 # (enable this to configure wifi settings from the UI)
@@ -69,13 +69,13 @@
 
 # enables shutdown and rebooting after changing system settings
 # (such as wifi settings or time zone)
-#enable_reboot false
+enable_reboot false
 
 # timeout in seconds to use when talking to the SMTP server
-#smtp_timeout 60
+smtp_timeout 60
 
 # timeout in seconds to wait for zip file creation
-#zip_timeout 500
+zip_timeout 500
 
 # enable adding and removing cameras from UI
-#add_remove_cameras true
+add_remove_cameras true

diff --git a/setup.py b/setup.py
index e5a0d89c8d1fd5fcd94db796c373dc1db8f69381..21f60552d7a95f7c50ee607702bdbe0cdf775a54 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,7 @@
 
 import os.path
-import subprocess
 
 from codecs import open
-from setuptools.command.sdist import sdist
 from setuptools import setup
 
 import motioneye
@@ -17,27 +15,6 @@ with open(os.path.join(here, 'README.rst'), encoding='utf-8') as f:
     long_description = f.read()
 
 
-# update the version according to git
-git_version = subprocess.Popen('git describe --tags',
-        stdout=subprocess.PIPE, stderr=open('/dev/null'), shell=True).communicate()[0].strip()
-
-if git_version:
-    print 'detected git version %s' % git_version
-    version = git_version
-
-else:
-    print 'using found version %s' % version
-
-
-class custom_sdist(sdist):
-    def run(self):
-        if git_version:
-            subprocess.Popen("sed -ri 's/VERSION = (.+)/VERSION = \"%s\"/' %s/__init__.py" % (git_version, name),
-                    shell=True).communicate()
-
-        sdist.run(self)
-
-
 setup(
     name=name,
     version=version,
@@ -45,7 +22,7 @@ setup(
     description='motionEye server',
     long_description=long_description,
 
-    url='https://bitbucket.org/ccrisan/motioneye/',
+    url='https://github.com/ccrisan/motioneye/',
 
     author='Calin Crisan',
     author_email='ccrisan@gmail.com',
@@ -87,9 +64,5 @@ setup(
         'console_scripts': [
             'meyectl=motioneye.meyectl:main',
         ],
-    },
-    
-    cmdclass={
-        'sdist': custom_sdist
     }
 )