mirror of
				https://github.com/arcan1s/ahriman.git
				synced 2025-10-31 13:53:41 +00:00 
			
		
		
		
	build: use requests-unixsocket2 fork
Since requests-2.32.0, the http+unix url scheme is brokek, check https://github.com/msabramo/requests-unixsocket/issues/73 for more details
This commit is contained in:
		| @ -34,9 +34,9 @@ COPY "docker/install-aur-package.sh" "/usr/local/bin/install-aur-package" | ||||
| ## darcs is not installed by reasons, because it requires a lot haskell packages which dramatically increase image size | ||||
| RUN pacman -Sy --noconfirm --asdeps devtools git pyalpm python-cerberus python-inflection python-passlib python-pyelftools python-requests python-srcinfo && \ | ||||
|     pacman -Sy --noconfirm --asdeps base-devel python-build python-flit python-installer python-wheel && \ | ||||
|     pacman -Sy --noconfirm --asdeps breezy git mercurial python-aiohttp python-boto3 python-cryptography python-jinja python-requests-unixsocket python-systemd rsync subversion && \ | ||||
|     pacman -Sy --noconfirm --asdeps breezy git mercurial python-aiohttp python-boto3 python-cryptography python-jinja python-systemd rsync subversion && \ | ||||
|     runuser -u build -- install-aur-package python-aioauth-client python-webargs python-aiohttp-apispec-git python-aiohttp-cors \ | ||||
|                                             python-aiohttp-jinja2 python-aiohttp-session python-aiohttp-security | ||||
|                                             python-aiohttp-jinja2 python-aiohttp-session python-aiohttp-security python-requests-unixsocket2 | ||||
|  | ||||
| ## FIXME since 1.0.4 devtools requires dbus to be run, which doesn't work now in container | ||||
| COPY "docker/systemd-nspawn.sh" "/usr/local/bin/systemd-nspawn" | ||||
|  | ||||
| @ -366,7 +366,7 @@ Web application requires the following python packages to be installed: | ||||
| * Additional web features also require ``aiohttp-apispec`` (autogenerated documentation), ``aiohttp_cors`` (CORS support, required by documentation). | ||||
| * In addition, authorization feature requires ``aiohttp_security``, ``aiohttp_session`` and ``cryptography``. | ||||
| * In addition to base authorization dependencies, OAuth2 also requires ``aioauth-client`` library. | ||||
| * In addition if you would like to disable authorization for local access (recommended way in order to run the application itself with reporting support), the ``requests-unixsocket`` library is required. | ||||
| * In addition if you would like to disable authorization for local access (recommended way in order to run the application itself with reporting support), the ``requests-unixsocket2`` library is required. | ||||
|  | ||||
| Middlewares | ||||
| ^^^^^^^^^^^ | ||||
|  | ||||
| @ -1313,7 +1313,7 @@ How to enable basic authorization | ||||
|    The ``salt`` parameter is optional, but recommended, and can be set to any (random) string. | ||||
|  | ||||
| #. | ||||
|    In order to provide access for reporting from application instances you can (the recommended way) use unix sockets by the following configuration (note, that it requires ``python-requests-unixsocket`` package to be installed): | ||||
|    In order to provide access for reporting from application instances you can (the recommended way) use unix sockets by the following configuration (note, that it requires ``python-requests-unixsocket2`` package to be installed): | ||||
|  | ||||
|    .. code-block:: ini | ||||
|  | ||||
|  | ||||
| @ -21,7 +21,7 @@ optdepends=('breezy: -bzr packages support' | ||||
|             'python-aiohttp-session: web server with authorization' | ||||
|             'python-boto3: sync to s3' | ||||
|             'python-cryptography: web server with authorization' | ||||
|             'python-requests-unixsocket: client report to web server by unix socket' | ||||
|             'python-requests-unixsocket2: client report to web server by unix socket' | ||||
|             'python-jinja: html report generation' | ||||
|             'python-systemd: journal support' | ||||
|             'rsync: sync by using rsync' | ||||
|  | ||||
| @ -81,7 +81,7 @@ web = [ | ||||
|     "aiohttp_session", | ||||
|     "aiohttp_security", | ||||
|     "cryptography", | ||||
|     "requests-unixsocket",  # required by unix socket support | ||||
|     "requests-unixsocket2",  # required by unix socket support | ||||
|     "setuptools",  # required by aiohttp-apispec | ||||
| ] | ||||
|  | ||||
|  | ||||
		Reference in New Issue
	
	Block a user