From 7e9c9a2792b6e8f71ad6fd774603ca4b0b4854bd Mon Sep 17 00:00:00 2001 From: Jonas L Date: Tue, 29 Mar 2022 14:25:34 +0200 Subject: [PATCH] chore: rename vagrant devices (#1716) --- Vagrantfile | 10 +++++----- api/README.md | 4 ++-- docs/developer-manual/environment.md | 26 +++++++++++++------------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 00890206e..d1b1e8ad5 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -6,7 +6,7 @@ # export VAGRANT_NO_PORT_FORWARDING=true # export VAGRANT_CPUS=4 # export VAGRANT_MEMORY=4096 -# vagrant up debian-buster +# vagrant up buster # Vagrant.configure('2') do |config| @@ -88,18 +88,18 @@ Vagrant.configure('2') do |config| end # Define all the OS boxes we support - config.vm.define "ubuntu-focal" do |os| + config.vm.define "focal" do |os| os.vm.box = "bento/ubuntu-20.04" setup_libretime(os, "debian.sh") end - config.vm.define 'ubuntu-bionic' do |os| + config.vm.define 'bionic' do |os| os.vm.box = 'bento/ubuntu-18.04' setup_nfs(config) setup_libretime(os, 'debian.sh') end - config.vm.define 'debian-bullseye' do |os| + config.vm.define 'bullseye' do |os| os.vm.box = 'debian/bullseye64' config.vm.provider 'virtualbox' do |v, override| override.vm.box = 'bento/debian-11' @@ -108,7 +108,7 @@ Vagrant.configure('2') do |config| setup_libretime(os, 'debian.sh') end - config.vm.define 'debian-buster' do |os| + config.vm.define 'buster' do |os| os.vm.box = 'debian/buster64' config.vm.provider 'virtualbox' do |v, override| override.vm.box = 'bento/debian-10' diff --git a/api/README.md b/api/README.md index cf80c28e4..53ddf335c 100644 --- a/api/README.md +++ b/api/README.md @@ -23,9 +23,9 @@ for the LibreTime instance. For a live reloading version within Vagrant: ``` -vagrant up debian-buster +vagrant up buster # Run through the web setup http://localhost:8080 -vagrant ssh debian-buster +vagrant ssh buster sudo systemctl stop libretime-api sudo systemctl restart libretime-analyzer libretime-celery libretime-liquidsoap libretime-playout cd /vagrant/api diff --git a/docs/developer-manual/environment.md b/docs/developer-manual/environment.md index a7f19e049..2987bc3b8 100644 --- a/docs/developer-manual/environment.md +++ b/docs/developer-manual/environment.md @@ -20,8 +20,8 @@ This is fixed by stopping virtualbox and re-creating the vagrant box: ```bash sudo systemctl stop virtualbox -vagrant destroy ubuntu-bionic -vagrant up ubuntu-bionic --provider=libvirt +vagrant destroy bionic +vagrant up bionic --provider=libvirt ``` ::: @@ -42,7 +42,7 @@ sudo usermod -aG libvirt $USER ```bash vagrant box add bento/ubuntu-18.04 --provider=virtualbox vagrant mutate bento/ubuntu-18.04 libvirt -vagrant up ubuntu-bionic --provider=libvirt +vagrant up bionic --provider=libvirt ``` On other distributions, you will need to install [libvirt](https://libvirt.org/) and `vagrant-mutate` and then run @@ -56,7 +56,7 @@ sudo usermod -a -G libvirt $USER vagrant plugin install vagrant-mutate vagrant box fetch bento/ubuntu-18.04 vagrant mutate bento/ubuntu-18.04 libvirt -vagrant up ubuntu-bionic --provider=libvirt +vagrant up bionic --provider=libvirt ``` ### Starting LibreTime Vagrant @@ -68,14 +68,14 @@ change the default provider if you have multiple installed. This can be done by ```bash git clone https://github.com/libretime/libretime cd libretime -vagrant up ubuntu-bionic +vagrant up bionic ``` If everything works out, you will find LibreTime on [port 8080](http://localhost:8080) and Icecast on [port 8000](http://localhost:8000). Once you reach the web setup GUI you can click through it using the default values. To -connect to the vagrant machine you can run `vagrant ssh ubuntu-bionic` in the libretime +connect to the vagrant machine you can run `vagrant ssh bionic` in the libretime directory. ### Alternative OS installations @@ -83,13 +83,13 @@ directory. With the above instructions LibreTime is installed on Ubuntu Bionic. The Vagrant setup offers the option to choose a different operation system according to you needs. -| OS | Command | Comment | -| ------------ | ---------------------------- | ----------------------------------------------------------- | -| Debian 10 | `vagrant up debian-buster` | Install on Debian Buster. | -| Debian 11 | `vagrant up debian-bullseye` | Install on Debian Bullseye. | -| Ubuntu 18.04 | `vagrant up ubuntu-bionic` | Install on Ubuntu Bionic Beaver. | -| Ubuntu 20.04 | `vagrant up ubuntu-focal` | Install on Ubuntu Focal Fossa. | -| CentOS | `vagrant up centos` | CentOS 8 with native systemd support and activated SELinux. | +| OS | Command | Comment | +| ------------ | --------------------- | ----------------------------------------------------------- | +| Debian 10 | `vagrant up buster` | Install on Debian Buster. | +| Debian 11 | `vagrant up bullseye` | Install on Debian Bullseye. | +| Ubuntu 18.04 | `vagrant up bionic` | Install on Ubuntu Bionic Beaver. | +| Ubuntu 20.04 | `vagrant up focal` | Install on Ubuntu Focal Fossa. | +| CentOS | `vagrant up centos` | CentOS 8 with native systemd support and activated SELinux. | ### Troubleshooting