diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..279e7e4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/plugins +/themes \ No newline at end of file diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..e4a8489 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "plugins/xibo-iRestos"] + path = plugins/xibo-iRestos + url = https://forge.cadoles.com/CNOUS/xibo-iRestos.git diff --git a/.vagrant/bundler/global.sol b/.vagrant/bundler/global.sol index d89387b..0f76490 100644 --- a/.vagrant/bundler/global.sol +++ b/.vagrant/bundler/global.sol @@ -1 +1 @@ -{"dependencies":[["vagrant-berkshelf",["= 5.1.2"]],["vagrant-hostmanager",["= 1.8.10"]],["vagrant-omnibus",["= 1.5.0"]],["log4r",[">= 0"]],["concurrent-ruby",["~> 1.0"]],["i18n",[">= 0"]],["micromachine",[">= 2","< 4"]],["vagrant-vbguest",["= 0.31.0"]]],"checksum":"ecea410ec36ec38b3c619188d2eb3a079a46b7b7b2ec2e158d9c6e155205cb88","vagrant_version":"2.3.7"} \ No newline at end of file +{"dependencies":[["vagrant-berkshelf",["= 5.1.2"]],["vagrant-hostmanager",["= 1.8.10"]],["vagrant-omnibus",["= 1.5.0"]],["net-ssh",[">= 2.6.5","< 8.0.0"]],["net-scp",[">= 1.1"]],["log4r",["~> 1.1"]],["vagrant-scp",["= 0.5.9"]],["concurrent-ruby",["~> 1.0"]],["i18n",[">= 0"]],["micromachine",[">= 2","< 4"]],["vagrant-vbguest",["= 0.31.0"]]],"checksum":"391831df3e90eded665f858fa26d6d21ee9b318aa509eee759e7da6cccf3aed7","vagrant_version":"2.4.0"} \ No newline at end of file diff --git a/Vagrantfile b/Vagrantfile index 999d470..a4bd8e0 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -5,6 +5,8 @@ Vagrant.configure("2") do |config| config.vm.define "web" do |web| web.vm.box = "generic/debian11" web.vm.provision "shell", path: "web.sh" + config.vm.synced_folder "./themes", "/srv/xibo-cms/web/theme/custom" + config.vm.synced_folder "./plugins", "/srv/xibo-cms/custom" web.vm.network "private_network", ip: "192.168.56.60" web.vm.network "forwarded_port", guest: 80, host: 1234, id: "nginx" web.vm.hostname = "web" diff --git a/db.sh b/db.sh index d57c280..ef5ac64 100644 --- a/db.sh +++ b/db.sh @@ -1,13 +1,13 @@ -export DEBIAN_FRONTEND=noninteractive -wget https://dev.mysql.com/get/mysql-apt-config_0.8.26-1_all.deb -dpkg -i ./mysql-apt-config_0.8.26-1_all.deb -yes | apt-get update -yes | apt-get install mysql-server +##export DEBIAN_FRONTEND=noninteractive +##wget https://dev.mysql.com/get/mysql-apt-config_0.8.26-1_all.deb +##dpkg -i ./mysql-apt-config_0.8.26-1_all.deb +##yes | apt-get update +##yes | apt-get install mysql-server -mysql -h 'localhost' << EOF -ALTER USER 'root'@'localhost' IDENTIFIED BY 'root'; -CREATE USER 'xibo'@'192.168.56.60' IDENTIFIED BY 'xibo'; -CREATE DATABASE xibo_db; -GRANT ALL PRIVILEGES ON xibo_db.* TO 'xibo'@'192.168.56.60' WITH GRANT OPTION; -FLUSH PRIVILEGES; -EOF \ No newline at end of file +##mysql -h 'localhost' << EOF +##ALTER USER 'root'@'localhost' IDENTIFIED BY 'root'; +##CREATE USER 'xibo'@'192.168.56.60' IDENTIFIED BY 'xibo'; +##CREATE DATABASE xibo_db; +##GRANT ALL PRIVILEGES ON xibo_db.* TO 'xibo'@'192.168.56.60' WITH GRANT OPTION; +##FLUSH PRIVILEGES; +##EOF \ No newline at end of file diff --git a/plugins/xibo-iRestos b/plugins/xibo-iRestos new file mode 160000 index 0000000..c811265 --- /dev/null +++ b/plugins/xibo-iRestos @@ -0,0 +1 @@ +Subproject commit c811265718409fcf7aa700bad831672d58d0c7e1 diff --git a/web.sh b/web.sh index e6e2cfb..6a4895c 100644 --- a/web.sh +++ b/web.sh @@ -8,6 +8,7 @@ yes | apt-get install apache2 ufw php php7.4-gd php-common php-cli php-json php- # Installation Xibo cms mkdir /srv/xibo-cms cd /srv/xibo-cms +mkdir -p web/theme/custom wget https://github.com/xibosignage/xibo-cms/releases/download/3.3.0/xibo-cms-3.3.0.tar.gz tar -xvzf xibo-cms-3.3.0.tar.gz --strip-components=1 rm xibo-cms-3.3.0.tar.gz