diff --git a/README.md b/README.md index 7abd0a6..581630e 100644 --- a/README.md +++ b/README.md @@ -24,10 +24,11 @@ add to your /etc/hosts : configure your vhosts to add a reverse proxy that will redirect the domain dev.figureslibres.com to our container ### nginx +edit ```/etc/nginx/sites-available/dev.figureslibres.cc.conf``` with : ```nginx server { listen 80; - server_name dev.figureslibres.io; + server_name dev.figureslibres.cc; location / { proxy_pass http://127.0.0.1:8882; proxy_set_header Host $host; @@ -40,6 +41,11 @@ server { } } ``` +then activate the vhost +```sh +sudo ln -s /etc/nginx/sites-available/dev.figureslibres.cc.conf /etc/nginx/sites-enabled/ +sudo systemctl restart nginx +``` ### Apache ```apache @@ -51,14 +57,6 @@ server { ``` -## Updating code - -``` -git pull figli master -# then update all submodules -git submodule update --recursive --checkout -``` - ## Docker ### start daemon @@ -76,18 +74,51 @@ then each time you want to launch the app ``` sudo docker-compose up -d ``` -### login the php environement to user the grav cli tools + +### check if containers are running +``` +sudo docker-compose ps +``` + +### check the logs +``` +sudo docker-compose logs -f +``` + +### install grav ``` sudo docker exec -it grav_figureslibres.cc_php_1 bash + +``` +### install grav +``` +# log into the php container +sudo docker exec -it figureslibrescc_php_1 bash +# install grav using cli +bin/grav install + ``` ### fixing permissions -from the ```grav_figureslibres.cc_php_1``` run the fixeperms.sh script + ``` -sudo docker exec -it grav_figureslibres.cc_php_1 bash -chmod +x fixperms.sh +# log into the php container +sudo docker exec -it figureslibrescc_php_1 bashchmod +x fixperms.sh +# run the script ./fixeperms.sh ``` +### Pages +fill the /user/pages with your contents or you'll get a 404 error + ## Visualize You can now visit http://dev.figureslibres.cc or simply http://localhost:8882 on your browser + + +## Updating code + +``` +git pull figli master +# then update all submodules +git submodule update --recursive --checkout +``` diff --git a/public_html b/public_html index f8b2b21..376bac8 160000 --- a/public_html +++ b/public_html @@ -1 +1 @@ -Subproject commit f8b2b21c5104349997790cd2bf2780c11c50344a +Subproject commit 376bac8ee50ec096c2a33904c69b1c56c167050b