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

DietPi-Software | Simplify and consistent config file naming #2312

Merged
merged 27 commits into from
Dec 3, 2018

Conversation

MichaIng
Copy link
Owner

@MichaIng MichaIng commented Dec 2, 2018

Status: Ready

  • Pydio
  • Nextcloud
  • ownCloud
  • dietpi-software
  • dietpi-letsencrypt
  • Search code
  • Patching
  • Changelog

Commit list/description:

  • nginx.pydio.conf
  • apache.nextcloud.conf
  • nginx.nextcloud.conf
  • 99-dietpi-kodi.rules
    ... all of them 😄

+ DietPi-Software | Simplify config file naming
@MichaIng MichaIng changed the title v6.19 DietPi-Software | Simplify config file naming Dec 2, 2018
+ DietPi-Software | Simplify config file naming
+ DietPi-Software | Simplify config file naming
+ DietPi-Software | Simplify config file naming
+ DietPi-Software | Consistent config file naming
+ DietPi-Software | Simplify config file naming
+ DietPi-Software | Simplify config file naming
+ DietPi-Software | Consistent config file naming
+ DietPi-Software | Simplify config file naming
+ DietPi-Software | Nginx: Minor alignment and Stretch PHP socket as default
+ DietPi-Software | Simplify config file naming
+ DietPi-Software | Consistent config file naming
Copy link
Owner Author

@MichaIng MichaIng left a comment

Choose a reason for hiding this comment

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

@Fourdee
Ah the idea was to just use conf here for config files?
Shall we then do this for other software titles as well?

Only concern I have is, if e.g. we remove a software title from DietPi and replace the ID, the old dietpi-software versions will not recognize and place a wrong config file.
If those have a more specific name, then at least the user will face a meaningful error, can upgrade, ask or inform himself about dropped software.

+ DietPi-Software | Simplify and consistent config file naming
+ Revert
+ Minor
@MichaIng MichaIng changed the title DietPi-Software | Simplify config file naming DietPi-Software | Simplify and consistent config file naming Dec 3, 2018
+ DietPi-Software | ownCloud: Create own apache config file
+ DietPi-Software | Nginx: Use native conf.d for our config files, no need to complicate
@MichaIng
Copy link
Owner Author

MichaIng commented Dec 3, 2018

@Fourdee
.conf/dps_6/50-rk3399.rules is not yet in use, should this be placed on Xserver install on this device?

+ DietPi-Software | ruTorrent: Conf file naming scheme
+ DietPi-Patch | Patch software config file renaming
@MichaIng MichaIng requested a review from Fourdee December 3, 2018 02:31
@MichaIng MichaIng self-assigned this Dec 3, 2018
@MichaIng MichaIng added Enhancement 💨 META Everything that is not code related, e.g. GitHub, Wiki, website, community labels Dec 3, 2018
@MichaIng MichaIng added this to the v6.19 milestone Dec 3, 2018
+ CHANGELOG | Software config file renaming
+ Syntax
@MichaIng
Copy link
Owner Author

MichaIng commented Dec 3, 2018

Damn... /etc/nginx/conf.d is main config level while /etc/nginx/sites-dietpi was server config level (included by sites-enabled/default).
Need to revert, no other solution than having an own include dir 🤔.

  • Done

+ Revert sites-dietpi
+ Revert sites-dietpi
+ Revert sites-dietpi
+ Whoopsie
+ Revert sites-dietpi removal
+ Whoopsie
@Fourdee
Copy link
Collaborator

Fourdee commented Dec 3, 2018

@MichaIng

Only concern I have is, if e.g. we remove a software title from DietPi and replace the ID, the old dietpi-software versions will not recognize and place a wrong config file.

Should not matter, as master branch will not change until we PR. Just need to make sure we update dietpi-software as needed, and, if we remove/swap software, set installed state to 0 on users system.

@Fourdee
Copy link
Collaborator

Fourdee commented Dec 3, 2018

@MichaIng

.conf/dps_6/50-rk3399.rules is not yet in use, should this be placed on Xserver install on this device?

Ignore it for now, testing/getting it ready only.

echo '# Redirect Cal/CardDAV requests to ownCloud endpoint:
location = /.well-known/carddav {
return 301 $scheme://$host/owncloud/remote.php/dav;
}
location = /.well-known/caldav {
return 301 $scheme://$host/owncloud/remote.php/dav;
}' > /etc/nginx/sites-dietpi/dietpi-dav_redirect.config
}' > /etc/nginx/sites-dietpi/dietpi-dav_redirect.conf
Copy link
Collaborator

Choose a reason for hiding this comment

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

Needs verifying if Nginx supports the .conf extension. Might require .config?

Copy link
Collaborator

Choose a reason for hiding this comment

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

See it passed local testing, will merge and test also:
https://github.com/Fourdee/DietPi/issues/2308#issuecomment-443547842

Copy link
Owner Author

Choose a reason for hiding this comment

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

@Fourdee
Jep file ending can be freely chosen by include directive. Also inside conf.d it is .conf, similar to all other webservers. So it's more constant to stay with this.

@Fourdee
Copy link
Collaborator

Fourdee commented Dec 3, 2018

@MichaIng

Thanks Micha, looks good, will merge 👍

@Fourdee Fourdee merged commit b0d28d5 into dev Dec 3, 2018
@MichaIng MichaIng deleted the config-naming branch December 3, 2018 15:42
@Fourdee Fourdee mentioned this pull request Dec 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Enhancement 💨 META Everything that is not code related, e.g. GitHub, Wiki, website, community
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants