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

Drop Vagrant development boxes #7503

Merged
merged 1 commit into from
Oct 19, 2023
Merged

Drop Vagrant development boxes #7503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 0 additions & 11 deletions .vagrant.yml.example
View file
Open in desktop

This file was deleted.

243 changes: 0 additions & 243 deletions Vagrantfile
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions bin/vagrant-bullseye
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions bin/vagrant-focal
View file
Open in desktop

This file was deleted.

12 changes: 12 additions & 0 deletions doc/CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
# develop

## Highlighted Features

* Remove Vagrant development boxes (Graeme Porteous)

## Upgrade Notes

* _Note:_ If you were using Vagrant development boxes these are now unsupported.
Please switch to using Docker. See:
https://alaveteli.org/docs/installing/docker/

# 0.43.2.0

## Highlighted Features
Expand Down
4 changes: 2 additions & 2 deletions script/defer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
# In /var/www/alaveteli/config/aliases, swap the filter to mailin to send to
# the defer script.
#
# # ^foi\\+.*: "|/home/vagrant/alaveteli/script/mailin"
# ^foi\\+.*: "|/home/vagrant/alaveteli/script/defer"
# # ^foi\\+.*: "|/home/alaveteli/script/mailin"
# ^foi\\+.*: "|/home/alaveteli/script/defer"
#
# If you have Alaveteli set up to filter messages to site admin addresses,
# redirect that to the defer script too.
Expand Down
14 changes: 0 additions & 14 deletions script/site-specific-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,20 +302,6 @@ if [ "$DEVELOPMENT_INSTALL" = true ]; then
gem install mailcatcher
fi

if [ "$DEVELOPMENT_INSTALL" = true ] && [ x"$SUDO_USER" = x"vagrant" ]
then
VAGRANT_DEV_INSTALL=true
fi

if [ "$VAGRANT_DEV_INSTALL" = true ] && [ ! -e "$REPOSITORY/config/xapian.yml" ]
then
cat > "$REPOSITORY/config/xapian.yml" <<EOF
# Create test xapian DBs outside of the VirtualBox share to avoid corruption
test:
base_db_path: "/tmp/xapiandbs"
EOF
fi

# Set up root's crontab:
echo -n "Creating /etc/cron.d/alaveteli... "
(su -l -c "cd '$REPOSITORY' && bundle exec rake config_files:convert_crontab DEPLOY_USER='$UNIX_USER' VHOST_DIR='$DIRECTORY' VCSPATH='$SITE' SITE='$SITE' RUBY_VERSION='$RUBY_VERSION' USE_RBENV=$USE_RBENV RAILS_ENV='$RAILS_ENV' CRONTAB=config/crontab-example" "$UNIX_USER") > /etc/cron.d/alaveteli
Expand Down
21 changes: 0 additions & 21 deletions script/test-vagrant-provisioning
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion spec/models/mail_server_log/postfix_line_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
describe '#to_s' do

it 'returns the log line' do
line = 'Oct 2 08:57:45 vagrant-ubuntu-precise-64 postfix/pickup[7843]: E9B4F420D5: uid=1001 from=<foi+request-117-c99ae4f3@localhost>'
line = 'Oct 2 08:57:45 ubuntu-precise-64 postfix/pickup[7843]: E9B4F420D5: uid=1001 from=<foi+request-117-c99ae4f3@localhost>'

Check warning on line 16 in spec/models/mail_server_log/postfix_line_spec.rb

View workflow job for this annotation

GitHub Actions / build 

[rubocop] reported by reviewdog 🐶
Layout/LineLength: Line is too long. [133/80] (https://rubystyle.guide#max-line-length)

Raw Output:
spec/models/mail_server_log/postfix_line_spec.rb:16:81: C: Layout/LineLength: Line is too long. [133/80] (https://rubystyle.guide#max-line-length)
      line = 'Oct  2 08:57:45 ubuntu-precise-64 postfix/pickup[7843]: E9B4F420D5: uid=1001 from=<foi+request-117-c99ae4f3@localhost>'
                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
expect(described_class.new(line).to_s).to eq(line)
end

Expand Down