From c7a8322ea5e14898ca2659bc0d471f9006eea22e Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Tue, 24 Apr 2018 12:49:26 +0300 Subject: Rename: ick2.install to just install This makes a package install *.service even if package name has been changed in CI. Fix: more debian/ick2.* renames Fix: put back postinst --- copyright-exceptions | 4 ++-- debian/dirs | 2 ++ debian/ick2.dirs | 2 -- debian/ick2.install | 1 - debian/ick2.postinst | 56 ---------------------------------------------------- debian/install | 1 + debian/postinst | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 61 insertions(+), 61 deletions(-) create mode 100644 debian/dirs delete mode 100644 debian/ick2.dirs delete mode 100644 debian/ick2.install delete mode 100644 debian/ick2.postinst create mode 100644 debian/install create mode 100644 debian/postinst diff --git a/copyright-exceptions b/copyright-exceptions index 37a267d..76265f4 100644 --- a/copyright-exceptions +++ b/copyright-exceptions @@ -5,8 +5,8 @@ debian/changelog debian/control debian/compat debian/copyright -debian/ick2.dirs -debian/ick2.install +debian/dirs +debian/install debian/source/format ick2/version.py pylint.conf diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 0000000..a398f42 --- /dev/null +++ b/debian/dirs @@ -0,0 +1,2 @@ +var/lib/ick +var/lib/ick/workspace diff --git a/debian/ick2.dirs b/debian/ick2.dirs deleted file mode 100644 index a398f42..0000000 --- a/debian/ick2.dirs +++ /dev/null @@ -1,2 +0,0 @@ -var/lib/ick -var/lib/ick/workspace diff --git a/debian/ick2.install b/debian/ick2.install deleted file mode 100644 index 79d3df2..0000000 --- a/debian/ick2.install +++ /dev/null @@ -1 +0,0 @@ -*.service lib/systemd/system diff --git a/debian/ick2.postinst b/debian/ick2.postinst deleted file mode 100644 index 35578ed..0000000 --- a/debian/ick2.postinst +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# Copyright 2017-2018 Lars Wirzenius -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - -set -eu - - -create_user() -{ - local name="$1" - local home="$2" - local logdir="$3" - - addgroup --force "$name" || true - adduser --disabled-login --disabled-password \ - --gecos "Ick CI" --home "$home" \ - --shell /bin/true --force \ - --ingroup "$name" \ - "$name" || true - install -d -m 0755 -o "$name" -g "$name" "$logdir" -} - - -# Create a group and user for ick users -create_user _ick /var/lib/ick /var/log/ick -create_user _ickwm /var/lib/ick/wm /var/log/ickwm -create_user _ickas /var/lib/ick/blobs /var/log/ickas - -# Create controller config dir. -install -d -m 0755 -o root -g root /etc/ick - -# Create controller state dir -install -d -m 0755 -o _ick -g _ick /var/lib/ick/state - -# Create worker-manager workspace -install -d -m 0755 -o _ickwm -g _ickwm /var/lib/ick/workspace - -# Create worker-manager systree -install -d -m 0755 -o _ickwm -g _ickwm /var/lib/ick/systree - -# Create artifact store storage -install -d -m 0755 -o _ickas -g _ickas /var/lib/ick/blobs - -#DEBHELPER# diff --git a/debian/install b/debian/install new file mode 100644 index 0000000..79d3df2 --- /dev/null +++ b/debian/install @@ -0,0 +1 @@ +*.service lib/systemd/system diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 0000000..35578ed --- /dev/null +++ b/debian/postinst @@ -0,0 +1,56 @@ +#!/bin/sh +# Copyright 2017-2018 Lars Wirzenius +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +set -eu + + +create_user() +{ + local name="$1" + local home="$2" + local logdir="$3" + + addgroup --force "$name" || true + adduser --disabled-login --disabled-password \ + --gecos "Ick CI" --home "$home" \ + --shell /bin/true --force \ + --ingroup "$name" \ + "$name" || true + install -d -m 0755 -o "$name" -g "$name" "$logdir" +} + + +# Create a group and user for ick users +create_user _ick /var/lib/ick /var/log/ick +create_user _ickwm /var/lib/ick/wm /var/log/ickwm +create_user _ickas /var/lib/ick/blobs /var/log/ickas + +# Create controller config dir. +install -d -m 0755 -o root -g root /etc/ick + +# Create controller state dir +install -d -m 0755 -o _ick -g _ick /var/lib/ick/state + +# Create worker-manager workspace +install -d -m 0755 -o _ickwm -g _ickwm /var/lib/ick/workspace + +# Create worker-manager systree +install -d -m 0755 -o _ickwm -g _ickwm /var/lib/ick/systree + +# Create artifact store storage +install -d -m 0755 -o _ickas -g _ickas /var/lib/ick/blobs + +#DEBHELPER# -- cgit v1.2.1