Skip to content

Commit

Permalink
Code cleanup and refactoring (#34)
Browse files Browse the repository at this point in the history
A variety of code cleanup changes, including some spelling corrections in code and documentation, update to the gh repo key, and version bumps for MARIA_VER and MANGO_VER. Most changes should be clear; for the gh repo key, see cli/cli#6175
  • Loading branch information
mgsisk committed Sep 6, 2022
1 parent 3d56e53 commit 43f5df3
Show file tree
Hide file tree
Showing 11 changed files with 2,433 additions and 1,829 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ Notable project changes. Versions are [semantic][].
### Changed

- Key management for apt sources
- MARIA_VER default to 10.10
- MONGO_VER default to 6.0

### Fixed

- Spelling errors

## [0.1.4][] - 2022-02-15

Expand Down
17 changes: 2 additions & 15 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,11 @@ Vagrant.configure('2') do |config|
ENV['HOST'] ||= '@ sys.@'
ENV['ZONE'] ||= 'America/Detroit'

bash_aliases = File.join(Dir.home, '.bash_aliases')
bash_profile = File.join(Dir.home, '.bash_profile')
gitconfig = File.join(Dir.home, '.gitconfig')
gitignore = File.join(Dir.home, '.gitignore')
npmrc = File.join(Dir.home, '.npmrc')
vimrc = File.join(Dir.home, '.vimrc')

config.vm.box = 'debian/contrib-buster64'
config.vm.box = 'bento/debian-11'
config.vm.box = 'bento/debian-11.2-arm64' if ENV['ARCH'].include? 'arm'
config.vm.hostname = File.basename(Dir.pwd) + '.test'
config.vm.network 'private_network', type: 'dhcp'
config.vm.provision 'shell', inline: 'echo "options single-request-reopen" >> /etc/resolv.conf' if ENV['ARCH'].include? 'arm'
config.vm.provision 'file', source: bash_aliases, destination: '~/.bash_aliases' if File.file?(bash_aliases)
config.vm.provision 'file', source: bash_profile, destination: '~/.bash_profile' if File.file?(bash_profile)
config.vm.provision 'file', source: gitconfig, destination: '~/.gitconfig' if File.file?(gitconfig)
config.vm.provision 'file', source: gitignore, destination: '~/.gitignore' if File.file?(gitignore)
config.vm.provision 'file', source: npmrc, destination: '~/.npmrc' if File.file?(npmrc)
config.vm.provision 'file', source: vimrc, destination: '~/.vimrc' if File.file?(vimrc)
config.vm.provision 'shell', inline: 'echo "options single-request-reopen" >>/etc/resolv.conf' if ENV['ARCH'].include? 'arm'
config.vm.provision 'shell', path: 'dist/provisioner.sh', env: {
'BUNDLER_CNF' => '/vagrant/docs/Gemfile',
'ZONE' => ENV['ZONE'],
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ provisioners after Providence.

Once configuration is complete, Providence will check for known project types to
see if there's anything it should build for you. This includes generating static
sites using Hugo, Jekyll, Pelican, or Zola, instsalling and configuring the
sites using Hugo, Jekyll, Pelican, or Zola, installing and configuring the
WordPress content management system, or linking a project directory to the
guests web root. By default, most of these setups are mutually exclusive as
they'll end up using the same web root on the guest, but you can change their
Expand Down

0 comments on commit 43f5df3

Please sign in to comment.