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

Jump to bottom

fix debian db migrations and service restarts #7224

Merged
merged 3 commits into from Nov 4, 2021
Merged

fix debian db migrations and service restarts #7224

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
f12013a
fix dh_systemd_* invocations
evgeni Nov 4, 2021
c3140ba
don't run db actions, let the user/installer do that
evgeni Nov 4, 2021
ce28c3c
changelog entries
evgeni Nov 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions debian/buster/foreman/changelog
View file
Open in desktop
@@ -1,3 +1,10 @@
foreman (3.1.0-4) stable; urgency=low

* fix dh_systemd_* calls
* don't run db:migrate in postinst

-- Evgeni Golov <evgeni@debian.org> Thu, 04 Nov 2021 09:58:34 +0100

foreman (3.1.0-3) stable; urgency=low

* Do not restart Dynflow services on package upgrade
Expand Down
11 changes: 0 additions & 11 deletions debian/buster/foreman/foreman-postgresql.postinst
View file
Open in desktop
Expand Up @@ -26,17 +26,6 @@ else
$BUNDLE update --jobs 4 --local 2>&1 >> $LOGFILE
fi

# Run a db:migrate and db:seed if the user has created a dbfile
if [ -f /usr/share/foreman/config/database.yml ]; then
if [ ! -z "${DEBUG}" ]; then
/usr/sbin/foreman-rake db:migrate || true
/usr/sbin/foreman-rake db:seed || true
else
/usr/sbin/foreman-rake db:migrate >> $LOGFILE 2>&1 || true
/usr/sbin/foreman-rake db:seed >> $LOGFILE 2>&1 || true
fi
fi

# Own all the core files
chown -Rf foreman:foreman '/usr/share/foreman'

Expand Down
12 changes: 0 additions & 12 deletions debian/buster/foreman/foreman.postinst
View file
Open in desktop
Expand Up @@ -66,18 +66,6 @@ if [ ! -e config/initializers/encryption_key.rb -a -e /etc/foreman/encryption_ke
ln -s /etc/foreman/encryption_key.rb config/initializers/
fi

# Run a db:migrate and db:seed if the user has created a dbfile
# always attempt to reencrypt after update in case new fields can be encrypted
if [ -f /usr/share/foreman/config/database.yml ]; then
if [ ! -z "${DEBUG}" ]; then
/usr/sbin/foreman-rake db:migrate db:encrypt_all || true
/usr/sbin/foreman-rake db:seed || true
else
/usr/sbin/foreman-rake db:migrate db:encrypt_all >> $LOGFILE 2>&1 || true
/usr/sbin/foreman-rake db:seed >> $LOGFILE 2>&1 || true
fi
fi

# Generate apipie cache
if [ ! -z "${DEBUG}" ]; then
/usr/sbin/foreman-rake apipie:cache:index || true
Expand Down
8 changes: 2 additions & 6 deletions debian/buster/foreman/rules
View file
Open in desktop
Expand Up @@ -47,13 +47,9 @@ build:
dh $@ --with=systemd

override_dh_systemd_start:
dh_systemd_start --no-start --restart-after-upgrade --name=foreman.service --package=foreman-service
dh_systemd_start --no-start --restart-after-upgrade --name=foreman.socket --package=foreman-service
dh_systemd_start --no-start --name=dynflow-sidekiq@orchestrator --package=foreman-dynflow-sidekiq
dh_systemd_start --no-start --name=dynflow-sidekiq@worker --package=foreman-dynflow-sidekiq
dh_systemd_start --no-start --restart-after-upgrade --package=foreman-service
dh_systemd_start --no-start --restart-after-upgrade --package=foreman-dynflow-sidekiq
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is technically a noop, as the package doesn't contain any restartable services (the template isn't restartable), so we could drop it…


override_dh_systemd_enable:
dh_systemd_enable --name=foreman.service --package=foreman-service
dh_systemd_enable --name=foreman.socket --package=foreman-service
dh_systemd_enable --name=dynflow-sidekiq@orchestrator --package=foreman-dynflow-sidekiq
dh_systemd_enable --name=dynflow-sidekiq@worker --package=foreman-dynflow-sidekiq
7 changes: 7 additions & 0 deletions debian/focal/foreman/changelog
View file
Open in desktop
@@ -1,3 +1,10 @@
foreman (3.1.0-4) stable; urgency=low

* fix dh_systemd_* calls
* don't run db:migrate in postinst

-- Evgeni Golov <evgeni@debian.org> Thu, 04 Nov 2021 09:58:34 +0100

foreman (3.1.0-3) stable; urgency=low

* Do not restart Dynflow services on package upgrade
Expand Down
11 changes: 0 additions & 11 deletions debian/focal/foreman/foreman-postgresql.postinst
View file
Open in desktop
Expand Up @@ -26,17 +26,6 @@ else
$BUNDLE update --jobs 4 --local 2>&1 >> $LOGFILE
fi

# Run a db:migrate and db:seed if the user has created a dbfile
if [ -f /usr/share/foreman/config/database.yml ]; then
if [ ! -z "${DEBUG}" ]; then
/usr/sbin/foreman-rake db:migrate || true
/usr/sbin/foreman-rake db:seed || true
else
/usr/sbin/foreman-rake db:migrate >> $LOGFILE 2>&1 || true
/usr/sbin/foreman-rake db:seed >> $LOGFILE 2>&1 || true
fi
fi

# Own all the core files
chown -Rf foreman:foreman '/usr/share/foreman'

Expand Down
12 changes: 0 additions & 12 deletions debian/focal/foreman/foreman.postinst
View file
Open in desktop
Expand Up @@ -66,18 +66,6 @@ if [ ! -e config/initializers/encryption_key.rb -a -e /etc/foreman/encryption_ke
ln -s /etc/foreman/encryption_key.rb config/initializers/
fi

# Run a db:migrate and db:seed if the user has created a dbfile
# always attempt to reencrypt after update in case new fields can be encrypted
if [ -f /usr/share/foreman/config/database.yml ]; then
if [ ! -z "${DEBUG}" ]; then
/usr/sbin/foreman-rake db:migrate db:encrypt_all || true
/usr/sbin/foreman-rake db:seed || true
else
/usr/sbin/foreman-rake db:migrate db:encrypt_all >> $LOGFILE 2>&1 || true
/usr/sbin/foreman-rake db:seed >> $LOGFILE 2>&1 || true
fi
fi

# Generate apipie cache
if [ ! -z "${DEBUG}" ]; then
/usr/sbin/foreman-rake apipie:cache:index || true
Expand Down
8 changes: 2 additions & 6 deletions debian/focal/foreman/rules
View file
Open in desktop
Expand Up @@ -47,13 +47,9 @@ build:
dh $@ --with=systemd

override_dh_systemd_start:
dh_systemd_start --no-start --restart-after-upgrade --name=foreman.service --package=foreman-service
dh_systemd_start --no-start --restart-after-upgrade --name=foreman.socket --package=foreman-service
dh_systemd_start --no-start --name=dynflow-sidekiq@orchestrator --package=foreman-dynflow-sidekiq
dh_systemd_start --no-start --name=dynflow-sidekiq@worker --package=foreman-dynflow-sidekiq
dh_systemd_start --no-start --restart-after-upgrade --package=foreman-service
dh_systemd_start --no-start --restart-after-upgrade --package=foreman-dynflow-sidekiq

override_dh_systemd_enable:
dh_systemd_enable --name=foreman.service --package=foreman-service
dh_systemd_enable --name=foreman.socket --package=foreman-service
dh_systemd_enable --name=dynflow-sidekiq@orchestrator --package=foreman-dynflow-sidekiq
dh_systemd_enable --name=dynflow-sidekiq@worker --package=foreman-dynflow-sidekiq