Default git hook does not work out of the box #876

jazzl0ver · 2018-09-24T16:36:52Z

Hi,

Enabling

hook = ([ -d .git ] || git init) && git add -A && (git diff --cached --quiet || git commit -m "Changes by "%(user)s)

leads to:

[7fa9f2c42ae8] DEBUG: Running hook
[7fa9f2c42ae8] DEBUG: Captured stderr hook:

*** Please tell me who you are.

Run

  git config --global user.email "[email protected]"
  git config --global user.name "Your Name"

to set your account's default identity.
Omit --global to set the identity only in this repository.

fatal: unable to auto-detect email address (got 'radicale@9009506c3d73.(none)')

[7fa9f2c42ae8] ERROR: An exception occurred during MKCOL request on '/myuser/0527aa01-08d0-01d4-4793-692bece1feeb/': Command '([ -d .git ] || git init) && git add -A && (git diff --cached --quiet || git commit -m "Changes by "myuser)' returned non-zero exit status 128.
Traceback (most recent call last):
  File "/usr/lib/python3.6/site-packages/radicale/__init__.py", line 332, in __call__
    status, headers, answers = self._handle_request(environ)
  File "/usr/lib/python3.6/site-packages/radicale/__init__.py", line 505, in _handle_request
    environ, base_prefix, path, user)
  File "/usr/lib/python3.6/site-packages/radicale/__init__.py", line 721, in do_MKCOL
    return client.CREATED, {}, None
  File "/usr/lib/python3.6/contextlib.py", line 88, in __exit__
    next(self.gen)
  File "/usr/lib/python3.6/site-packages/radicale/storage.py", line 1587, in acquire_lock
    raise subprocess.CalledProcessError(p.returncode, p.args)
subprocess.CalledProcessError: Command '([ -d .git ] || git init) && git add -A && (git diff --cached --quiet || git commit -m "Changes by "myuser)' returned non-zero exit status 128.

Workaround is to run

git config user.email "[email protected]"

in the collections folder.

Would be great if you could fix that!

The text was updated successfully, but these errors were encountered:

Fixes Kozea#876

ikwyl6 · 2018-10-14T01:52:16Z

Even though I iniitially did the "git init" in the collections dir, when I run:

sudo -u radicale git config user [email protected]

I get:

fatal: not in a git directory

# ls -al
total 20
drwxrwx--- 4 radicale radicale 4096 Oct 13 22:18 .
drwxrwx--- 3 radicale radicale 4096 Oct 13 21:19 ..
-rw-r----- 1 radicale radicale    0 Oct 13 22:35 .Radicale.lock
drwxrwx--- 7 radicale radicale 4096 Oct 13 21:24 .git
-rwxrwx--- 1 radicale alarm      47 Oct 13 21:26 .gitignore
drwxr-x--- 4 radicale radicale 4096 Oct 13 22:23 collection-root

mookie- · 2018-11-26T23:38:08Z

@ikwyl6 you initialized the git repository in the wrong directory. It has to be one directory "up", e.g. /var/lib/radicale/ if your path is /var/lib/radicale/collections.

mpasternak · 2018-12-19T00:09:35Z

This is a documentation issue and I'm working on it (expect the PR soon)

mookie- · 2018-12-21T00:45:32Z

@mpasternak I've already did a PR (#883)

mpasternak · 2018-12-21T09:33:53Z

@mookie- I commented it!

mpasternak · 2018-12-31T10:49:52Z

@mookie- this is how I would do that: #913 #914

Fixes Kozea#876

mookie- · 2019-01-09T10:42:58Z

@mpasternak You are right, this is much better. Thank you! I'll close my PR.

vmario89 · 2019-01-13T14:11:52Z

Hi,
i has some trouble too and messed with configuration. I solved it for me by:

vim /etc/radicale/config
[storage]
filesystem_folder = /var/lib/radicale/collections
hook = ([ -d .git ] || git init) && git add -A && (git diff --cached --quiet || git commit -m "Changes by "%(user)s)

cd /var/lib/radicale/collections
git init

vim .gitignore
.Radicale.cache
.Radicale.lock
.Radicale.tmp-*

cd /var/lib
chown -R radicale:radicale radicale/
sudo -u radicale git config user.name YourName
sudo -u radicale git config user.email [email protected]
service radicale restart

#make some new entry in calendar and then check radicale log and git commit history
tail -f /etc/radicale/radicale.log
cd /var/lib/radicale/collections
git log

regards, Mario

mpasternak · 2019-01-13T14:53:10Z

@vmario89 this is great, feel free to submit a pull request to my branch and I'll merge it so Kozea devs can merge just that PR. #913 #914

fractalf · 2019-12-01T22:39:29Z

Hi, I solved this in another way if anyone's interested.

I'm using a docker-compose.yml file to set up radicale (note the 2 GIT_* entries). This is slightly stripped, as I use an nginx/lets encrypt proxy also.

version: "3.7"

services:
    radicale:
        image: <user>/radicale
        build: ./
        container_name: radicale
        restart: always
        environment:
            GIT_NAME: <user>
            GIT_EMAIL: <email>
        volumes:
            - radicale:/data
            - ./config:/etc/radicale:ro
        ports:
            - 5232

volumes:
    radicale:
        driver_opts:
            type: none
            o: bind
            device: /mnt/ssd-data/docker-data/radicale

I'm using a slightly modified Dockerfile (added git + a user other than root)

FROM alpine:latest

# Version of Radicale (e.g. 2.0.0)
ARG VERSION=master
ARG USER=radicale

# Install dependencies
RUN apk add --no-cache \
      python3 \
      python3-dev \
      build-base \
      libffi-dev \
      ca-certificates \
      openssl \
      git

# Install Radicale
RUN wget --quiet https://github.com/Kozea/Radicale/archive/${VERSION}.tar.gz --output-document=radicale.tar.gz && \
    tar xzf radicale.tar.gz && \
    pip3 install ./Radicale-${VERSION}[md5,bcrypt] && \
    rm -r radicale.tar.gz Radicale-${VERSION}
# Install dependencies for Radicale<2.1.9
RUN pip3 install passlib[bcrypt]
# Remove build dependencies
RUN apk del \
      python3-dev \
      build-base \
      libffi-dev

RUN adduser -HD ${USER}
RUN mkdir /data && chown ${USER}.${USER} /data
USER radicale

# Run Radicale (Configure it here or provide a "config" file!)
CMD ["radicale", "--hosts", "0.0.0.0:5232"]

My config

[server]
hosts = 0.0.0.0:5232

[auth]
type = htpasswd
htpasswd_filename = /etc/radicale/users
htpasswd_encryption = bcrypt
delay = 1

[storage]
filesystem_folder = /data/collections
hook = /etc/radicale/git.sh

Note the git.sh which I'm calling in the hook here. It calls a small shell script which fixes all the git stuff so you don't need to do anything when booting up the docker container

#!/bin/sh
cd /data/collections

if [ ! -d .git ]; then
    git init
    git config user.name "$GIT_NAME"
    git config user.email "$GIT_EMAIL"
    echo -e ".Radicale.cache\n.Radicale.lock\n.Radicale.props\n.Radicale.tmp-*" > .gitignore
fi

git add -A
git diff --cached --quiet || git commit -m "Update"

allo- · 2021-07-05T08:58:05Z

You may want to add, that configuring user.name and user.email is not only for having nice names in the commit log, but that git breaks when they are unset.

And it would be good to merge it soon. I had the issue for months until I found the problem myself after quite a bit of debugging (and came here after I wanted to create an issue about it).

oscarcarlsson · 2021-12-01T13:26:33Z

So the issue here is a small typo at the end of the line in the documentation. The current line is:

hook = ([ -d .git ] || git init) && git add -A && (git diff --cached --quiet || git commit -m "Changes by "%(user)s)

The line is missing a quote sign at the end, and should escape the quotation sign in the commit message. It should look like this to work:

hook = ([ -d .git ] || git init) && git add -A && (git diff --cached --quiet || git commit -m "Changes by \"%(user)s\"")

Maybe I should have a look at a PR (new or present), but in case some one else ends up here looking for the same thing, the above might help.

pbiering · 2024-03-14T21:03:35Z

Maybe I should have a look at a PR (new or present), but in case some one else ends up here looking for the same thing, the above might help.

doc fixed now, thank you!

mookie- added a commit to mookie-/Radicale that referenced this issue Oct 13, 2018

let example hook set user & email at first commit

de74843

Fixes Kozea#876

mookie- mentioned this issue Oct 13, 2018

let example hook set user & email at first commit #883

Closed

mpasternak mentioned this issue Dec 31, 2018

Verbose description of git hook configuration #913

Open

mpasternak added a commit to mpasternak/Radicale that referenced this issue Dec 31, 2018

Extra information about git hook

572d88a

Fixes Kozea#876

mpasternak mentioned this issue Dec 31, 2018

Extra information about git hook #914

Open

jsosulski mentioned this issue Mar 16, 2021

Git integration with systemd service #1153

Closed

pbiering added the documentation label Mar 14, 2024

pbiering added a commit that referenced this issue Mar 14, 2024

fix buggy example for git, solving #876

0b9a53c

pbiering added the bug label Mar 14, 2024

pbiering self-assigned this Mar 14, 2024

pbiering added this to the 3.1.9 milestone Mar 14, 2024

pbiering closed this as completed Mar 14, 2024

pbiering added a commit that referenced this issue Mar 15, 2024

fix buggy example for git, solving #876

b1336c2

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Default git hook does not work out of the box #876

Default git hook does not work out of the box #876

jazzl0ver commented Sep 24, 2018

ikwyl6 commented Oct 14, 2018

mookie- commented Nov 26, 2018

mpasternak commented Dec 19, 2018

mookie- commented Dec 21, 2018

mpasternak commented Dec 21, 2018

mpasternak commented Dec 31, 2018 •

edited

Loading

mookie- commented Jan 9, 2019

vmario89 commented Jan 13, 2019 •

edited

Loading

mpasternak commented Jan 13, 2019

fractalf commented Dec 1, 2019

allo- commented Jul 5, 2021

oscarcarlsson commented Dec 1, 2021

pbiering commented Mar 14, 2024

Default git hook does not work out of the box #876

Default git hook does not work out of the box #876

Comments

jazzl0ver commented Sep 24, 2018

ikwyl6 commented Oct 14, 2018

mookie- commented Nov 26, 2018

mpasternak commented Dec 19, 2018

mookie- commented Dec 21, 2018

mpasternak commented Dec 21, 2018

mpasternak commented Dec 31, 2018 • edited Loading

mookie- commented Jan 9, 2019

vmario89 commented Jan 13, 2019 • edited Loading

mpasternak commented Jan 13, 2019

fractalf commented Dec 1, 2019

allo- commented Jul 5, 2021

oscarcarlsson commented Dec 1, 2021

pbiering commented Mar 14, 2024

mpasternak commented Dec 31, 2018 •

edited

Loading

vmario89 commented Jan 13, 2019 •

edited

Loading