.gitignore

@@ -1,9 +1,107 @@
-bower_components
-*.pyc
-/blacklist/static/img/thumbnails/*
-!/blacklist/static/img/thumbnails/README.md
+node_modules
 .idea/*
+
+# Byte-compiled / optimized / DLL files
 __pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
 
-/blacklist/static/pdf/*
-!/blacklist/static/pdf/README.md
+# mypy
+.mypy_cache/

.gitlab-ci.yml

@@ -1,43 +1,41 @@
 stages:
   - test
   - package
-  - packagetest
   - deploy
 
 test:debian:
   stage: test
   script:
     - apt-get update -qy
     - apt-get install -y python3-dev python3-pip
-    - pip3 install -r requirements.txt
+    - pip3 install .
     - python3 setup.py test
   tags:
     - debian
 
-test:archlinux:
-  stage: test
-  script:
-    - pacman -Sy python-pip --noconfirm #gcc
-    - pip install -r requirements.txt
-    - python setup.py test
-  tags:
-    - archlinux
+#test:archlinux:
+#  stage: test
+#  script:
+#    - pacman -Sy python-pip python-setuptools --noconfirm
+#    - pip install .
+#    - python setup.py test
+#  tags:
+#    - archlinux
 
 package:debian:
   stage: package
   script:
     - apt-get update -qy
-    - apt-get install -y curl gnupg
-    - curl -sL https://deb.nodesource.com/setup_8.x | bash -
-    - curl -sL https://apt.salamek.cz/apt/conf/salamek.gpg.key | apt-key add -
-    - echo "deb     https://apt.salamek.cz/apt all main" | tee /etc/apt/sources.list.d/salamek.cz.list
+    - apt-get install -y curl gnupg apt-transport-https wget
+    - wget -O- https://repository.salamek.cz/deb/salamek.gpg | tee /usr/share/keyrings/salamek-archive-keyring.gpg
+    - echo "deb     [signed-by=/usr/share/keyrings/salamek-archive-keyring.gpg] https://repository.salamek.cz/deb/pub all main" | tee /etc/apt/sources.list.d/salamek.cz.list
     - apt-get update -qy
-    - apt-get install -y python3-dnspython python3-pygal python3-flask-redis-helper xvfb wkhtmltopdf python3-tabula-py python3-pillow python3-pypdf2 python3-lxml python3-flask-celery-helper python3-flask-caching python3-dev python-pip redis-server python3-pip python3-stdeb python3-celery nodejs git python3-markupsafe python3-psycopg2 python3-dateutil python3-docopt python3-yaml python3-wtforms python3-raven python3-flask-migrate python3-flask-babel python3-flask-navigation python3-flask-login
-    - npm install -g bower
+    - apt-get install -y nodejs dh-python npm python3-dnspython python3-pygal python3-flask-script python3-flask-redis-helper xvfb wkhtmltopdf python3-tabula-py python3-pillow python3-pypdf2 python3-lxml python3-flask-celery-tools python3-flask-caching python3-dev redis-server python3-pip python3-stdeb python3-celery nodejs git python3-markupsafe python3-psycopg2 python3-dateutil python3-docopt python3-yaml python3-wtforms python3-raven python3-flask-migrate python3-flask-babel python3-flask-navigation python3-flask-login
     - rm -rf "./deb_dist"
     - cd blacklist/static
-    - bower install --allow-root
+    - npm install
     - cd -
+    - export DEB_BUILD_OPTIONS=nocheck
     - python3 setup.py --command-packages=stdeb.command bdist_deb
   tags:
     - debian
@@ -47,56 +45,25 @@ package:debian:
       - deb_dist/*.deb
     expire_in: 1d
 
-package:archlinux:
-  stage: package
-  script:
-    - echo "[salamek]" >> /etc/pacman.conf
-    - echo "Server = https://arch.salamek.cz/any" >> /etc/pacman.conf
-    - echo "SigLevel = Optional" >> /etc/pacman.conf
-    - pacman -Sy python-pip python-dnspython python-pygal gcc nodejs wkhtmltopdf xorg-server-xvfb python-tabula python-lxml sudo git redis openssh bower python-flask-caching postgresql python-flask-celery-helper python-flask-redis-helper python-celery python-flask python-babel python-yaml python-flask-login python-flask-migrate python-flask-wtf python-raven python-docopt python-eventlet python-psycopg2 python-flask-babel python-flask-navigation fakeroot systemd python-pypdf2 --noconfirm
-    - useradd -m -G users -s /bin/bash package
-    - cd archlinux
-    - sudo -H -u package makepkg -f
-  tags:
-    - archlinux
+#package:archlinux:
+#  stage: package
+#  script:
+#    - echo "[salamek]" >> /etc/pacman.conf
+#    - echo "Server = https://repository.salamek.cz/arch/pub/any" >> /etc/pacman.conf
+#    - echo "SigLevel = Optional" >> /etc/pacman.conf
+#    - pacman -Sy python-pip python-dnspython python-pygal python-flask-script gcc nodejs wkhtmltopdf xorg-server-xvfb python-tabula python-lxml sudo git redis openssh python-flask-caching postgresql python-flask-celery-tools python-flask-redis-helper python-celery python-flask python-babel python-yaml python-flask-login python-flask-migrate python-flask-wtf python-raven python-docopt python-eventlet python-psycopg2 python-flask-babel python-flask-navigation fakeroot systemd python-pypdf2 --noconfirm
+#    - useradd -m -G users -s /bin/bash package
+#    - chown -R package:users archlinux
+#    - cd archlinux
+#    - sudo -H -u package makepkg -f
+#  tags:
+#    - archlinux
+#
+#  artifacts:
+#    paths:
+#      - archlinux/blacklist*.pkg.tar.zst
+#    expire_in: 1d
 
-  artifacts:
-    paths:
-      - archlinux/blacklist*
-    expire_in: 1d
-
-packagetest:debian:
-  stage: packagetest
-  script:
-    - apt-get update -qy
-    - apt-get install -y curl gnupg apt-transport-https
-    - curl -sL https://apt.salamek.cz/apt/conf/salamek.gpg.key | apt-key add -
-    - echo "deb     https://apt.salamek.cz/apt all main" | tee /etc/apt/sources.list.d/salamek.cz.list
-    - apt-get update -qy
-    - cd deb_dist
-    - apt install ./*.deb -qy
-  tags:
-    - virtualbox-debian
-  dependencies:
-    - package:debian
-  only:
-    - tags
-
-packagetest:archlinux:
-  stage: packagetest
-  script:
-    - echo "[salamek]" >> /etc/pacman.conf
-    - echo "Server = https://arch.salamek.cz/any" >> /etc/pacman.conf
-    - echo "SigLevel = Optional" >> /etc/pacman.conf
-    - pacman -Sy
-    - cd archlinux
-    - pacman -U blacklist*.pkg.tar.xz --noconfirm
-  tags:
-    - virtualbox-archlinux
-  dependencies:
-    - package:archlinux
-  only:
-    - tags
 
 repoupdate:
   stage: deploy
@@ -109,14 +76,15 @@ repoupdate:
     - mkdir -p ~/.ssh
     - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
   script:
-    - ssh www-data@salamek.cz 'rm -rf /var/www/arch.salamek.cz/www/any/blacklist*.pkg.tar.xz'
-    - ssh www-data@salamek.cz 'rm -rf /var/www/apt.salamek.cz/cache/blacklist*.pkg.tar.xz'
-    - scp archlinux/blacklist*.pkg.tar.xz www-data@salamek.cz:/var/www/arch.salamek.cz/www/any
-    - scp deb_dist/*.deb www-data@salamek.cz:/var/www/apt.salamek.cz/cache
-    - ssh www-data@salamek.cz '/var/www/arch.salamek.cz/update_repo.sh'
-    - ssh www-data@salamek.cz '/var/www/apt.salamek.cz/update_repo.sh'
+    #- ssh www-data@repository 'rm -rf /var/www/repository.salamek.cz/www/arch/pub/any/blacklist*.pkg.tar.zst'
+    - ssh www-data@repository 'rm -rf /var/www/repository.salamek.cz/cache/deb/pub/all/blacklist*.deb'
+    #- scp archlinux/blacklist*.pkg.tar.zst www-data@repository:/var/www/repository.salamek.cz/www/arch/pub/any
+    - scp deb_dist/*.deb www-data@repository:/var/www/repository.salamek.cz/cache/deb/pub/all
+    - ssh www-data@repository '/var/www/repository.salamek.cz/deb-pub-update.sh'
+    #- ssh www-data@repository '/var/www/repository.salamek.cz/arch-pub-update.sh'
+
   dependencies:
-    - package:archlinux
+    #- package:archlinux
     - package:debian
   tags:
     - docker

.version.yml

@@ -0,0 +1,15 @@
+GIT:
+    AUTO_COMMIT: true
+    AUTO_TAG: true
+    AUTO_PUSH: true # false=disabled, true=enabled, 'remote_name'=enabled and push to remote_name
+    COMMIT_MESSAGE: 'New version {version}'
+
+REGEXPS:
+    'python': __version__\s*=\s*\'(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\'
+    'setup.py': version\s*=\s*\'(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\'
+    'PKGBUILD': pkgver\s*=\s*(?P<version>.*)
+
+VERSION_FILES:
+    'blacklist/__init__.py': 'python'
+    'setup.py': 'setup.py'
+    'archlinux/PKGBUILD': 'PKGBUILD'

README.md

@@ -1,4 +1,4 @@
-# Czech blacklist info page
+# Czech Web BLACKLIST info page
 
 This is simple Czech Web BLACKLIST info page with simple API to retrieve blacklist items written in Python Flask
 
@@ -13,7 +13,8 @@ Original blacklist is in [PDF](http://www.mfcr.cz/assets/cs/media/Zverejnovane-u
 * Your provider blocking info
 * OSS :)
 
-# Installation
+# Installation Guide
+
 
 Debian, Ubuntu and Archlinux packages are supported!
 
@@ -29,14 +30,14 @@ blacklist_celerybeat # To process periodic tasks
 Add repository by running these commands
 
 ```
-$ wget -O - https://apt.salamek.cz/apt/conf/salamek.gpg.key|sudo apt-key add -
-$ echo "deb     https://apt.salamek.cz/apt all main" | sudo tee /etc/apt/sources.list.d/salamek.cz.list
+$ wget -O - https://repository.salamek.cz/deb/salamek.gpg.key|sudo apt-key add -
+$ echo "deb     https://repository.salamek.cz/deb/pub all main" | sudo tee /etc/apt/sources.list.d/salamek.cz.list
 ```
 
-And then you can install a package python3-blacklist
+And then you can install a package `blacklist`
 
 ```
-$ apt update && apt install python3-blacklist
+$ apt update && apt install blacklist
 ```
 
 ## Archlinux
@@ -45,7 +46,7 @@ Add repository by adding this at end of file /etc/pacman.conf
 
 ```
 [salamek]
-Server = https://arch.salamek.cz/any
+Server = https://repository.salamek.cz/arch/pub
 SigLevel = Optional
 ```
 
@@ -63,7 +64,7 @@ $ git clone https://github.com/Salamek/blacklist.git
 $ cd blacklist
 $ pip install -r requirements.txt
 $ blacklist post_install --config_prod
-$ bower install
+$ npm i
 $ python3 manage.py server
 $ python3 manage.py celerybeat
 $ python3 manage.py celeryworker
@@ -86,12 +87,15 @@ Here is example UWSGI configuration, dont forgot to stop and disable blacklist s
 [uwsgi]
 uid = www-data
 master = true
-chdir = /usr/lib/python3/dist-packages/blacklist
-socket = /var/run/blacklist.sock
+threads=2
+processes = 5
+max_request = 300
+chdir = /usr/lib/python3/dist-packages/blacklist/
 module = wsgi
 callable = app
 plugins = python3
 buffer-size = 32768
+
 ```
 
 # Nginx
@@ -105,7 +109,7 @@ server {
         root /usr/lib/python3/dist-packages/blacklist;
 
         location / {
-                uwsgi_pass unix:///var/run/blacklist.sock;
+                uwsgi_pass unix:///run/uwsgi/app/blacklist.salamek.cz/socket;
                 include uwsgi_params;
         }
 }