nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-03-11 09:04:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

vagrant: Mount source in /freedombox instead of /vagrant

Browse Source 
For uniformity with the more often used ./container script. Developers may have
to destroy and recreate their vagrant machines for this to take effect.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2023-02-04 16:27:25 -08:00 committed by James Valleroy
parent f1060fbf6b
commit e80f07250b
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
HACKING.md
View File

@ -283,10 +283,10 @@ and requires about 4.5 GB of disk space.
#### Using the Virtual Machine
After logging into the virtual machine (VM), the source code is available in
/vagrant directory:
/freedombox directory:
```bash
vm$ cd /vagrant
vm$ cd /freedombox
```
Run the development version of FreedomBox Service (Plinth) from your source
@ -295,7 +295,7 @@ continuously deploys your code changes into the virtual machine providing a
quick feedback cycle during development.
```bash
vm$ sudo -u plinth /vagrant/run --develop
vm$ freedombox-develop
```
If you have changed any system configuration files during your development,

8
Vagrantfile vendored
View File

@ -8,7 +8,7 @@ Vagrant.configure(2) do |config|
config.vm.box = "freedombox/freedombox-testing-dev"
config.vm.network "forwarded_port", guest: 443, host: 4430
config.vm.network "forwarded_port", guest: 445, host: 4450
config.vm.synced_folder ".", "/vagrant", owner: "plinth", group: "plinth"
config.vm.synced_folder ".", "/freedombox", owner: "plinth", group: "plinth"
config.vm.provider "virtualbox" do |vb|
vb.cpus = Etc.nprocessors
vb.memory = 2048
@ -22,7 +22,7 @@ Vagrant.configure(2) do |config|
systemctl disable plinth
SHELL
config.vm.provision "shell", inline: <<-SHELL
cd /vagrant/
cd /freedombox/
./setup.py install
systemctl daemon-reload
# Stop any ongoing upgrade
@ -36,14 +36,14 @@ Vagrant.configure(2) do |config|
apt-mark unhold freedombox
# Install ncurses-term
DEBIAN_FRONTEND=noninteractive apt-get install -y ncurses-term
echo 'alias run-develop="sudo -u plinth /vagrant/run --develop"' >> /home/vagrant/.bashrc
echo 'alias freedombox-develop="sudo -u plinth /freedombox/run --develop"' >> /home/vagrant/.bashrc
SHELL
config.vm.provision "tests", run: "never", type: "shell", path: "plinth/tests/functional/install.sh"
config.vm.post_up_message = "FreedomBox virtual machine is ready
for development. You can run the development version of Plinth using
the following command.
$ vagrant ssh
$ sudo -u plinth /vagrant/run --develop
$ freedombox-develop
Plinth will be available at https://localhost:4430/plinth (with
an invalid SSL certificate).
"

2
vagrant-scripts/plinth-user-permissions.py
View File

@ -6,7 +6,7 @@
import pathlib
content = '''
Cmnd_Alias FREEDOMBOX_ACTION_DEV = /usr/share/plinth/actions/actions, /vagrant/actions/actions
Cmnd_Alias FREEDOMBOX_ACTION_DEV = /usr/share/plinth/actions/actions, /freedombox/actions/actions
Defaults!FREEDOMBOX_ACTION_DEV closefrom_override
plinth ALL=(ALL:ALL) NOPASSWD:SETENV : FREEDOMBOX_ACTION_DEV
fbx ALL=(ALL:ALL) NOPASSWD : ALL