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.

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

Piwik Debian package: Apache2 improvements #59

Merged
merged 3 commits into from
Oct 29, 2017
Merged

Piwik Debian package: Apache2 improvements #59

merged 3 commits into from
Oct 29, 2017

Conversation

dg01d
Copy link
Contributor

@dg01d dg01d commented Oct 14, 2017

Patches following:

piwik.postinst & piwik.rminst
Inserts logic to deal with Debian 8+ /etc/apache2/conf-available configuration location

conf/apache.conf
References /etc/apache2/conf-available in header comments

@dg01d dg01d mentioned this pull request Oct 14, 2017
Copy link
Contributor

@aureq aureq left a comment

Choose a reason for hiding this comment

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

Thank you @dg01d for this PR. I've added a few comments to make things more conform with Debian.

if [ ! -e /etc/apache2/conf-available/piwik.conf ];
then
ln -s /etc/piwik/apache.conf /etc/apache2/conf-available/piwik.conf
ln -s /etc/apache2/conf-available/piwik.conf /etc/apache2/conf-enabled/piwik.conf
Copy link
Contributor

Choose a reason for hiding this comment

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

a2enconf --maintmode piwik should be called instead.


if [ -L /etc/apache2/conf-available/piwik.conf ];
then
rm -f /etc/apache2/conf-available/piwik.conf
Copy link
Contributor

Choose a reason for hiding this comment

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

a2disconf --maintmode piwik should be called instead

if [ -L /etc/apache2/conf-available/piwik.conf ];
then
rm -f /etc/apache2/conf-available/piwik.conf
if [ -L /etc/apache2/conf-enabled/piwik.conf ];
Copy link
Contributor

Choose a reason for hiding this comment

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

Should be removed after a2disconf is called.

@dg01d
Copy link
Contributor Author

dg01d commented Oct 23, 2017

Made those changes, aureq. thanks for the positive feedback.

@aureq aureq merged commit d4e7326 into matomo-org:master Oct 29, 2017
@aureq
Copy link
Contributor

aureq commented Oct 29, 2017

@dg01d Thanks, that's now merged. Following your work, the package attempts to be smarter by detecting previous installations.

@dg01d dg01d deleted the apache2-patch branch October 29, 2017 16:12
@mattab mattab changed the title Apache2 patch Piwik Debian package: Apache2 improvements Dec 5, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants