Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up inithooks #42

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Clean up inithooks #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b2e551
Clean up firstboot inithooks - shellcheck fixes, remove redundant com…
JedMeister Dec 17, 2024
1ba9052
add missing 'schema' from cli switches
JedMeister Dec 17, 2024
2512b82
gitlab password output as string to relevant stream
JedMeister Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions overlay/usr/lib/inithooks/bin/gitlab.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ def usage(s=None):

def main():
try:
opts, args = getopt.gnu_getopt(sys.argv[1:], "h",
['help', 'pass=', 'email=', 'domain='])
opts, args = getopt.gnu_getopt(
sys.argv[1:], "h",
['help', 'pass=', 'email=', 'domain=', 'schema=']
)
except getopt.GetoptError as e:
usage(e)

Expand Down Expand Up @@ -106,8 +108,12 @@ def main():
p2 = Popen(["gitlab-rake", "gitlab:password:reset[root]"],
stdin=p1.stdout, stdout=PIPE)
p1.stdout.close()
if p2.returncode == 0:
stream = sys.stdout
else:
stream = sys.stderr
output = p2.communicate()[0]
print(output)
print(output.decode(), file=stream)
sys.exit(p2.returncode)


Expand Down
8 changes: 1 addition & 7 deletions overlay/usr/lib/inithooks/firstboot.d/20regen-gitlab-secrets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
# already removed during initial build, but just in case they're being re-run.
mv /etc/gitlab/gitlab-secrets.json /etc/gitlab/gitlab-secrets.json.bak || true

if ! $(systemctl is-active --quiet gitlab-runsvdir.service); then
if ! systemctl is-active --quiet gitlab-runsvdir.service; then
systemctl start gitlab-runsvdir.service
fi

# As of v15.2 the TurnKey GitLab appliance installs the Omnibus package, so
# there is nothing more to do here.
#
# That is because with no secrets file, when 'gitlab-ctl reconfigure' is called
# (by 'bin/gitlab.py' inithook) the secrets are regenerated.
18 changes: 9 additions & 9 deletions overlay/usr/lib/inithooks/firstboot.d/40gitlab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@

. /etc/default/inithooks

exit_status=0
fatal() { echo "$(basename "$0"): FATAL: $*" >&2; exit 1; }

# if GitLab isn't already running, start it
if ! $(systemctl is-active --quiet gitlab-runsvdir.service); then
if ! systemctl is-active --quiet gitlab-runsvdir.service; then
systemctl start gitlab-runsvdir.service
fi

[ -e $INITHOOKS_CONF ] && . $INITHOOKS_CONF
$INITHOOKS_PATH/bin/gitlab.py --pass="$APP_PASS" --email="$APP_EMAIL" --domain="$APP_DOMAIN" \
|| exit_status=1 # ensure that temp service is disabled even if gitlab inithook fails

# moved token reset to $INITHOOKS_PATH/bin/gitlab.py - at the same time as
# setting password - should fix #1315/#1342 for good!
if [[ -f "$INITHOOKS_CONF" ]]; then
source "$INITHOOKS_CONF"
else
echo "$(basename "$0"): Warning: $INITHOOKS_CONF not found or is not a file (expected if not preseeded" >&2
fi

exit $exit_status
"$INITHOOKS_PATH/bin/gitlab.py" --pass="$APP_PASS" --email="$APP_EMAIL" --domain="$APP_DOMAIN" \
|| fatal "$INITHOOKS_PATH/bin/gitlab.py failed"