.gitignore

@@ -5,11 +5,16 @@ pidFile.txt
 # exclude custom users.db names
 *users.db
 vk4xmpp.log
+vk4xmpp.db
+vk4xmpp.sqlite
+vk4xmpp.pid
 # exclude log file created after init.d/vk4xmpp start
 gateway.log
 gateway_v5.0.py
 # exclude PyDev/Aptana project files
 .*project
+# exclude PyCharm project files
+.idea/
 # exclude ~ bak files
 *~
-/.settings
+/.settings

Config_example.txt

@@ -1,28 +1,27 @@
 # coding: utf-8
 
-# Connection hostname.
-# For Prosody: "vk.example.com".
+# Connection host.
+# For Prosody/Ejabberd: "vk.example.com".
+# For Openfire (for new versions): just subdomain ("vk" for vk.example.com).
 Host = "localhost"
 
 # Connection server (usually equals hostname).
-# For Prosody: "localhost".
+# If your transport runs on the same server as the jabber-server
+# then it's just "localhost".
 Server = "localhost" 
 
 # Connection port (as set in Jabber server config).
 # Default value for Prosody is 5347.
-Port = 5556
+Port = 5347
 
-# Transport ID (for all instances of vk4xmpp).
+# Transport ID (the ID which the transport will send stanzas from).
 TransportID = "vk.example.com"
 
 # Connection password.
 Password = "secret"
 
 # Language (ru/en/pl).
-DefLang = "ru"
-
-# Photo size (photo_50, photo_100, photo_200_orig).
-PhotoSize = "photo_100"
+DefLang = "en"
 
 # White list. Put servers here that should be allowed access to the
 # transport, e.g., ['yourserver1.tld','yourserver2.tld'].
@@ -34,68 +33,92 @@ WhiteList = []
 # Leave it blank to disable notifications.
 WatcherList = []
 
+# List of admin jids (JID for "!eval" command and admin-features in adhoc).
+# Example: ["mrdoctorwho@example.com", "lindsey@somehost.com"]
+ADMIN_JIDS = []
+
 # Additional description. It will be shown after "about" text in transport's vCard.
 AdditionalAbout = ""
 
 # Conference server. Leave it blank to disable group chats. Depends on Jabber
 # server's MUC. E.g., conference.example.com.
 ConferenceServer = ""
 
-# Publish this intstance information in public transport list at
+# Photo size (photo_50, photo_100, photo_200_orig).
+# Affects transport stability & performance
+PhotoSize = "photo_100"
+
+# Publish this intstance information in the public transport list at
 # http://xmppserv.ru.ru/xmpp-monitor.
 allowBePublic = True
 
 # User limit. How many users can be registered on your server?
-# Set to 0 for "unlimited".
+# Set to 0 for unlimited.
 USER_LIMIT = 0
 
-#! Danger zone.
-#! Change settings below ONLY IF YOU KNOW WHAT ARE YOU DOING! DEFAULT VALUES ARE RECOMMENDED!
-## Thread stack size (WARNING: THIS MAY CAUSE TRANSPORT CRASH WITH SEGMENTATION FAULT ERROR).
-## You may need to tune it to optimize memory consuming.
-## Minimum value is 32768 bytes (32kb).
-THREAD_STACK_SIZE = 0
+# URL which will be used in registration form. See the example in js/vk4xmpp.html or in http://simpleapps.ru/vk4xmpp.html (if the site is still alive in your time)
+# URL MUST have "%d" somewhere, it's used for access definition. Since 01.08.2014 any plugin can modify the access, so it will be defined in the url.
+URL_ACCEPT_APP = "http://opiums.eu/vk4xmpp.html#%d"
 
-## Maximum forwarded messages depth.
-MAXIMUM_FORWARD_DEPTH = 20
+# Image that will be used if the transport can't recieve image from VK.
+URL_VCARD_NO_IMAGE = "https://raw.githubusercontent.com/mrDoctorWho/vk4xmpp/master/vk4xmpp.png"
 
-## Image that will be used if the transport can't recieve image from VK.
-URL_VCARD_NO_IMAGE = "http://simpleapps.ru/vk4xmpp.png"
+# Allow registration.
+# Set to false if you want to forbid registration of new users.
+# Old users will be able to update their registration.
+ALLOW_REGISTRATION = True
 
-## Eval JID (JID for "!eval" command and admin-features in adhoc).
-evalJID = ""
+# Friends limit per user.
+MAX_FRIENDS = 5000
 
-## Debug xmpppy library.
-DEBUG_XMPPPY = False
+#! Danger zone.
+#! Change the settings below ONLY IF YOU KNOW WHAT ARE YOU DOING! DEFAULT VALUES ARE RECOMMENDED!
+# You were warned.
+# Thread stack size (WARNING: THIS MAY CAUSE TRANSPORT CRASH WITH SEGMENTATION FAULT ERROR).
+# You may need to tune it to optimize memory consuming.
+# Minimum value is 32768 bytes (32kb).
+THREAD_STACK_SIZE = 0
 
-## Database file (anything you like).
-DatabaseFile = "users.db"
+# Database file (anything you like).
+DatabaseFile = "vk4xmpp.sqlite"
 
-## File to store PID in.
-pidFile = "pidFile.txt"
+# File to store PID in.
+pidFile = "vk4xmpp.pid"
 
-## Log file.
+# Log file.
 logFile = "vk4xmpp.log"
 
-## Directory for crash logs storage.
+# Directory where transport will write crash logs.
 crashDir = "crash"
 
-## Log level (logging.INFO, logging.DEBUG, logging.ERROR, logging.CRITICAL).
-LOG_LEVEL = logging.DEBUG
-
-## Directory for users settings.
+# Directory for users settings.
 settingsDir = "settings"
 
-## Stanza send interval (in seconds).
+# Stanza send interval (in seconds).
 STANZA_SEND_INTERVAL = 0.03125
 
-## Enable photo hashes? This setting is probably can cause weird errors such as captcha, random disconnects (IOError: Disconnected) and others.
-## But users like to see avatars in their roster. If it will cause disconnects, but you still want to use it, then just increase the STANZA_SEND_INTERVAL value
-## But be careful, this value is global so transport will became slower.
-ENABLE_PHOTO_HASHES = False
+# Debug xmpppy library.
+DEBUG_XMPPPY = False
 
-## Debug longpoll queries.
+# Debug longpoll queries.
 DEBUG_POLL = False
 
-## Debug api requests. It should contain a list of methods which you would like to debug.
-DEBUG_API = []
+# Debug api requests. 
+# Put the list of the methods you like to debug. Set to "all" if you want to debug all the methods.
+DEBUG_API = []
+
+# Log level (logging.INFO, logging.DEBUG, logging.ERROR, logging.CRITICAL).
+LOG_LEVEL = logging.ERROR
+
+# VK4XMPP Monitor settings
+# The server where the stats requests will come from
+VK4XMPP_MONITOR_SERVER = "opiums.eu"
+
+# The URL where transport should send POST requests with it's name
+# See https://github.com/aawray/xmpp-monitor for more information
+VK4XMPP_MONITOR_URL = "http://torrent.opiums.eu/hosts_xmpp.php"
+
+# THE FOLLOWING OPTIONS ARE FOR POSIX-LIKE SYSTEMS ONLY
+# Run as a specified user. Set to "username" to run as "username" instead of current user.
+# Bear in mind that transport must have permission to run as this user.
+RUN_AS = None

DEBIAN/control.template

@@ -0,0 +1,9 @@
+Package: vk4xmpp
+Version: VERSION
+Section: network, chat
+Priority: optional
+Architecture: all
+Depends: python2.7
+Maintainer: mrDoctorWho <support@simpleapps.ru>
+Description: XMPP vk.com transport service
+Homepage: https://github.com/mrDoctorWho/vk4xmpp/

DEBIAN/postinst → DEBIAN/postinst.initd

@@ -3,14 +3,11 @@
 set -e
 
 if [ "$1" = configure ]; then
-   #update-rc.d vk4xmpp start 99 0 1 6 . stop 01 0 1 6 .
 
    if ! getent passwd vk4xmpp >/dev/null; then
       adduser --disabled-password --quiet --system \
         --home "/usr/share/vk4xmpp" --no-create-home \
         --gecos "Vkontakte XMPP Transport" --group vk4xmpp
     fi
-
-    update-rc.d vk4xmpp defaults
-
-fi
+	update-rc.d vk4xmpp defaults
+fi

DEBIAN/postinst.systemd

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = configure ]; then
+
+   if ! getent passwd vk4xmpp >/dev/null; then
+      adduser --disabled-password --quiet --system \
+        --home "/usr/share/vk4xmpp" --no-create-home \
+        --gecos "Vkontakte XMPP Transport" --group vk4xmpp
+    fi
+fi

DEBIAN/prerm

@@ -2,8 +2,8 @@
 
 case "$1" in
 	remove|purge)
-		# Remove all .pyc files from installation directories
-		DIR="/usr/share/vk4xmpp/"
-		rm -f `find "$DIR" -name *.py`
+		# Remove all compiled python files from installation directories
+		DIR="/usr/lib/vk4xmpp/"
+		find "$DIR" -type f -name "*.py[cod]" -delete
 		;;
 esac

Makefile

@@ -1,31 +1,47 @@
-#
-# Makefile
-#
-# this makefile is currently only used to make snapshots
-
-
-VERSION=2.`git log --pretty=format:''|wc -l`
-PACKAGE_VERSION=2
+GLOBAL_VERSION=3.0
+PACKAGE_VERSION:=$(shell git describe --tags)
+VERSION=$(GLOBAL_VERSION)+$(PACKAGE_VERSION)
 PROG=dpkg-deb
-SOURCE=/tmp/vk4xmpp_build
+SOURCE:=$(shell mktemp -d)
 FLAGS=--build
-DEBTARGET=vk4xmpp_$(VERSION)-$(PACKAGE_VERSION)_all.deb
+DEBTARGET=vk4xmpp_$(VERSION)_all.deb
 TARGET=vk4xmpp-$(VERSION)
 
-default:
-	@echo "options are 'snapshot', 'clean'"
+DOCS=LICENSE README.md extensions.README.md
+
+.PHONY: help hierarchy
+
+help:
+	@echo "VK4XMPP build script"
+	@echo "===================="
+	@echo "help - display this help and exit"
+	@echo "init-package - build package with SysV flavour"
+	@echo "systemd-package - build package with SystemD flavour"
 
+hierarchy:
+	mkdir -p $(SOURCE)/usr/share/doc/vk4xmpp
+	mkdir -p $(SOURCE)/usr/bin
+	mkdir -p $(SOURCE)/var/lib/vk4xmpp
+	mkdir -p $(SOURCE)/etc/vk4xmpp/conf.d
+	mkdir -p $(SOURCE)/var/log/vk4xmpp
+	mkdir -p $(SOURCE)/usr/lib/vk4xmpp
+	mkdir -p $(SOURCE)/run/vk4xmpp
+	mkdir -p $(SOURCE)/DEBIAN
+	cp DEBIAN/pre* $(SOURCE)/DEBIAN
+	sed s/VERSION/$(VERSION)/ < DEBIAN/control.template > $(SOURCE)/DEBIAN/control
+	cp gateway.py $(SOURCE)/usr/bin/vk4xmpp
+	cp $(DOCS) $(SOURCE)/usr/share/doc/vk4xmpp
+	cp Config_example.txt $(SOURCE)/etc/vk4xmpp/config.example
+	cp -R library modules js extensions locales $(SOURCE)/usr/lib/vk4xmpp
+	find $(SOURCE) -type f -name "*.py" -print0 | xargs -0 python -m compileall
 
-debian_package:
-	rm -rf $(SOURCE)
-	mkdir -p $(SOURCE)
-	mkdir -p $(SOURCE)/usr/share/vk4xmpp
-	cp -r . $(SOURCE)/usr/share/vk4xmpp
-	rm -rf $(SOURCE)/usr/share/vk4xmpp/.git
-	mkdir -p $(SOURCE)/etc
-	mv $(SOURCE)/usr/share/vk4xmpp/DEBIAN $(SOURCE)
-	mv $(SOURCE)/usr/share/vk4xmpp/init.d $(SOURCE)/etc/init.d
+init-package: hierarchy
+	cp DEBIAN/postinst.initd $(SOURCE)/DEBIAN/postinst
+	cp -R init.d $(SOURCE)/etc/init.d
 	fakeroot $(PROG) $(FLAGS) $(SOURCE) $(DEBTARGET)
 
-clean:
-	rm -Rf $(SOURCE)
+systemd-package: hierarchy
+	cp $(SOURCE)/DEBIAN/postinst.systemd $(SOURCE)/DEBIAN/postinst
+	mkdir -p $(SOURCE)/etc/systemd/system
+	cp -R systemd/vk4xmpp.service.debian $(SOURCE)/etc/systemd/system/vk4xmpp.service
+	fakeroot $(PROG) $(FLAGS) $(SOURCE) $(DEBTARGET)