Merge branch 'master' of https://git.disroot.org/Disroot/Website into debian_script

This commit is contained in:
meaz 2021-07-17 21:17:15 +02:00
commit 427a1c5800
Signed by: meaz
GPG Key ID: CD7A47B2F1ED43B4
2 changed files with 10 additions and 10 deletions

View File

@ -5,13 +5,13 @@
If you prefer the easy way, just execute the vagrant.sh script provided. Make sure your user is in sudoers first. ⚠️ It has been tested with Debian Buster only. ⚠️ If you prefer the easy way, just execute the vagrant.sh script provided. Make sure your user is in sudoers first. ⚠️ It has been tested with Debian Buster only. ⚠️
## requirements ## requirements
1. vagrant 2.2.10 1. vagrant 2.2.17
for install on Debian run commands: for install on Debian run commands:
``` ```
wget https://releases.hashicorp.com/vagrant/2.2.10/vagrant_2.2.10_x86_64.deb wget https://releases.hashicorp.com/vagrant/2.2.17/vagrant_2.2.17_x86_64.deb
``` ```
``` ```
sudo dpkg -i vagrant_2.2.10_x86_64.deb sudo dpkg -i vagrant_2.2.17_x86_64.deb
``` ```
``` ```
sudo apt install -f sudo apt install -f
@ -28,7 +28,7 @@ If you prefer the easy way, just execute the vagrant.sh script provided. Make su
wget -q https://www.virtualbox.org/download/oracle_vbox.asc -O- | sudo apt-key add - wget -q https://www.virtualbox.org/download/oracle_vbox.asc -O- | sudo apt-key add -
``` ```
``` ```
sudo apt-get update ; sudo apt-get install virtualbox-6.0 sudo apt-get update ; sudo apt-get install virtualbox-6.1
``` ```
3. vagrant plugins vagrant-vbguest: 3. vagrant plugins vagrant-vbguest:
@ -70,21 +70,21 @@ If you prefer the easy way, just execute the vagrant.sh script provided. Make su
``` ```
7. Clone Disroot Changelog repo to Disroot folder 7. Clone Disroot Changelog repo to Disroot folder
``` ```
git clone https://git.disroot.org/Disroot/CHANGELOG.git ~/Disroot/Disroot-Privacy-Policy git clone https://git.disroot.org/Disroot/CHANGELOG.git ~/Disroot/Disroot-Changelog
``` ```
8. Add the local domain name for the hub to your host machine's `/etc/hosts` file. 8. Add the local domain name for the hub to your host machine's `/etc/hosts` file.
``` ```
echo "192.168.33.12 disroot.lan" >> /etc/hosts sudo echo "192.168.33.12 disroot.lan" >> /etc/hosts
``` ```
9. Launch Vagrant to build the virtual machine (VM). This will take several minutes. 9. Launch Vagrant to build the virtual machine (VM). This will take several minutes.
``` ```
cd ~/Disroot/disroot-website/vagrant cd ~/Disroot/Website/vagrant
vagrant up disroot_lan vagrant up disroot_lan
``` ```
Congratulations, you should now have a fully functioning apache+GRAV server running locally in a Virtualbox-hosted VM managed by Vagrant. Next time you want to run vagrant simply run command Congratulations, you should now have a fully functioning apache+GRAV server running locally in a Virtualbox-hosted VM managed by Vagrant. Next time you want to run vagrant simply run command
``` ```
cd ~/Disroot/disroot-website/vagrant cd ~/Disroot/Website/vagrant
vagrant up disroot_lan vagrant up disroot_lan
vagrant provision vagrant provision
``` ```
@ -100,7 +100,7 @@ To make your development workflow more efficient, you may wish to use an SSH con
``` ```
2. Use `vagrant ssh disroot_lan` to log in to the virtual machine. 2. Use `vagrant ssh disroot_lan` to log in to the virtual machine.
``` ```
user@host:~$ cd ~/Disroot/disroot-website/vagrant user@host:~$ cd ~/Disroot/Website/vagrant
user@host:hubzilla-vagrant$ vagrant ssh disroot_lan user@host:hubzilla-vagrant$ vagrant ssh disroot_lan
``` ```
3. Switch to root and add your host user public key. 3. Switch to root and add your host user public key.

2
vagrant/Vagrantfile vendored
View File

@ -22,6 +22,6 @@ Vagrant.configure("2") do |config|
disroot_lan.vm.synced_folder "../../grav-theme-disrootblog/", "/var/www/grav-theme-disrootblog", owner: "www-data", group: "www-data" disroot_lan.vm.synced_folder "../../grav-theme-disrootblog/", "/var/www/grav-theme-disrootblog", owner: "www-data", group: "www-data"
disroot_lan.vm.synced_folder "../../grav-plugin-language-selector/", "/var/www/grav-plugin-language-selector", owner: "www-data", group: "www-data" disroot_lan.vm.synced_folder "../../grav-plugin-language-selector/", "/var/www/grav-plugin-language-selector", owner: "www-data", group: "www-data"
disroot_lan.vm.synced_folder "../../Disroot-Privacy-Policy/", "/var/www/privacy_policy/", owner: "www-data", group: "www-data" disroot_lan.vm.synced_folder "../../Disroot-Privacy-Policy/", "/var/www/privacy_policy/", owner: "www-data", group: "www-data"
disroot_lan.vm.synced_folder "../../CHANGELOG/", "/var/www/changelog/", owner: "www-data", group: "www-data" disroot_lan.vm.synced_folder "../../Disroot-Changelog/", "/var/www/changelog/", owner: "www-data", group: "www-data"
end end
end end