Merge lp:~sylvain-pineau/checkbox/server-cert-config into lp:~checkbox-dev/checkbox/checkbox-packaging

Proposed by Sylvain Pineau
Status: Merged
Approved by: Zygmunt Krynicki
Approved revision: 38
Merged at revision: 37
Proposed branch: lp:~sylvain-pineau/checkbox/server-cert-config
Merge into: lp:~checkbox-dev/checkbox/checkbox-packaging
Diff against target: 21 lines (+10/-0)
2 files modified
debian/canonical-certification-server.install (+2/-0)
debian/extras/canonical-certification-config/canonical-certification.conf (+8/-0)
To merge this branch: bzr merge lp:~sylvain-pineau/checkbox/server-cert-config
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve
Review via email: mp+194330@code.launchpad.net

Description of the change

Canonical-certification-server installs two conf files, one to get the cert welcome text and the other one to install the autostart feature.

To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

While this looks good I cannot shake the feeling that this is not something one wants to configure. It feels like a intrinsic part of canonical-certification-server.

To make it true configuration I think we need to consider using ucf(1) and in general look at the policy for handling configuration files http://www.debian.org/doc/debian-policy/ap-pkg-conffiles.html

review: Needs Fixing
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

conffiles (See http://www.debian.org/doc/manuals/maint-guide/dother.en.html#conffiles):

dh_installdeb(1) automatically flags any files under the /etc directory as conffiles, so if your program only has conffiles there you do not need to specify them in this file.
[...]
When you upgrade a package, you'll be asked whether you want to keep your old configuration files or not.

So it seems that keeping our conf files in /etc is all we have to do.
ucf does the same thing as it prompts the user ifn MD5 checksums differ between the two versions.

What else should we consider?

Revision history for this message
Zygmunt Krynicki (zyga) wrote :

> conffiles (See http://www.debian.org/doc/manuals/maint-
> guide/dother.en.html#conffiles):
>
> dh_installdeb(1) automatically flags any files under the /etc directory as
> conffiles, so if your program only has conffiles there you do not need to
> specify them in this file.
> [...]
> When you upgrade a package, you'll be asked whether you want to keep your old
> configuration files or not.
>
> So it seems that keeping our conf files in /etc is all we have to do.
> ucf does the same thing as it prompts the user ifn MD5 checksums differ
> between the two versions.
>
> What else should we consider?

Ah, I didn't know this was the case. I recall packages with relatively complex install scripts that carefully upgraded each script using ucf.

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/canonical-certification-server.install'
2--- debian/canonical-certification-server.install 2013-10-29 10:45:12 +0000
3+++ debian/canonical-certification-server.install 2013-11-07 12:29:45 +0000
4@@ -1,1 +1,3 @@
5 usr/bin/canonical-certification-server
6+debian/extras/canonical-certification-config/canonical-certification.conf /etc/xdg
7+checkbox-ng/contrib/canonical-certification-server.conf etc/init
8
9=== added directory 'debian/extras/canonical-certification-config'
10=== added file 'debian/extras/canonical-certification-config/canonical-certification.conf'
11--- debian/extras/canonical-certification-config/canonical-certification.conf 1970-01-01 00:00:00 +0000
12+++ debian/extras/canonical-certification-config/canonical-certification.conf 2013-11-07 12:29:45 +0000
13@@ -0,0 +1,8 @@
14+[common]
15+welcome_text = Welcome to System Certification!
16+
17+ This application will gather information from your system. Then you will be asked manual tests to confirm that the system is working properly. Finally, you will be asked for the Secure ID of the computer to submit the information to the certification.canonical.com database.
18+
19+ To learn how to create or locate the Secure ID, please see here:
20+
21+ https://certification.canonical.com/home/ubuntu-certified

Subscribers

People subscribed via source and target branches