Commit f41bd69a authored by Administrator's avatar Administrator 💬

chore: m3p2.ljbac.com -> gitlab.m3p2.com

parent ffd25334
Pipeline #3723 failed with stage
...@@ -33,7 +33,7 @@ build: ...@@ -33,7 +33,7 @@ build:
# - php bin/composer.phar install # - php bin/composer.phar install
- rm -R user/pages - rm -R user/pages
- git clone https://m3p2.ljbac.com/m3p2/courses.git user/pages - git clone https://gitlab.m3p2.com/m3p2/courses.git user/pages
script: script:
- pwd - pwd
......
[submodule "user/pages"] [submodule "user/pages"]
path = user/pages path = user/pages
url = https://m3p2.ljbac.com/m3p2/courses.git url = https://gitlab.m3p2.com/m3p2/courses.git
...@@ -54,7 +54,7 @@ USER www-data ...@@ -54,7 +54,7 @@ USER www-data
# Install grav todo: shallow clone? # Install grav todo: shallow clone?
WORKDIR /var/www WORKDIR /var/www
RUN git clone https://m3p2.ljbac.com/m3p2/grav-website.git grav \ RUN git clone https://gitlab.m3p2.com/m3p2/grav-website.git grav \
&& mv -T /var/www/grav /var/www/html && mv -T /var/www/grav /var/www/html
# curl -o grav-admin.zip -SL https://getgrav.org/download/core/grav-admin/${GRAV_VERSION} && \ # curl -o grav-admin.zip -SL https://getgrav.org/download/core/grav-admin/${GRAV_VERSION} && \
# echo "$GRAV_SHA1 grav-admin.zip" | sha1sum -c - && \ # echo "$GRAV_SHA1 grav-admin.zip" | sha1sum -c - && \
...@@ -71,7 +71,7 @@ RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \ ...@@ -71,7 +71,7 @@ RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
# Grab the courses, since we're not using submodules (yet) # Grab the courses, since we're not using submodules (yet)
WORKDIR /var/www/html WORKDIR /var/www/html
RUN rm -R user/pages \ RUN rm -R user/pages \
&& git clone https://m3p2.ljbac.com/m3p2/courses.git user/pages && git clone https://gitlab.m3p2.com/m3p2/courses.git user/pages
#RUN bin/clone_courses.sh #RUN bin/clone_courses.sh
# Grav will handle "composer install" internally # Grav will handle "composer install" internally
...@@ -85,4 +85,4 @@ USER root ...@@ -85,4 +85,4 @@ USER root
# COPY docker-entrypoint.sh /entrypoint.sh # COPY docker-entrypoint.sh /entrypoint.sh
# ENTRYPOINT ["/entrypoint.sh"] # ENTRYPOINT ["/entrypoint.sh"]
# CMD ["apache2-foreground"] # CMD ["apache2-foreground"]
\ No newline at end of file
...@@ -14,7 +14,7 @@ PHP `7.1.3` (or above) is required. ...@@ -14,7 +14,7 @@ PHP `7.1.3` (or above) is required.
Clone this repository: Clone this repository:
git clone --recursive https://m3p2.ljbac.com/m3p2/m3p2-html-generator.git m3p2-html-generator git clone --recursive https://gitlab.m3p2.com/m3p2/m3p2-html-generator.git m3p2-html-generator
Enter the project: Enter the project:
...@@ -83,7 +83,7 @@ Clone your project ...@@ -83,7 +83,7 @@ Clone your project
* Shift+Right click where you want to put m3p2 to "Open Command line here" * Shift+Right click where you want to put m3p2 to "Open Command line here"
* use the command: * use the command:
git clone --recursive https://m3p2.ljbac.com/m3p2/grav-website.git m3p2-html-generator git clone --recursive https://gitlab.m3p2.com/m3p2/grav-website.git m3p2-html-generator
Download https://getcomposer.org/composer.phar and copy it in m3p2-html-generator/bin Download https://getcomposer.org/composer.phar and copy it in m3p2-html-generator/bin
...@@ -112,11 +112,11 @@ Put m3p2 "online" ...@@ -112,11 +112,11 @@ Put m3p2 "online"
This may come in handy when we'll want offline access This may come in handy when we'll want offline access
wget -mkxKE -e robots=off https://courses.m3p2.ljbac.com wget -mkxKE -e robots=off https://m3p2.com
And then to browse locally, for example : And then to browse locally, for example :
cd courses.m3p2.ljbac.com cd m3p2.com
firefox index.html firefox index.html
......
...@@ -8,7 +8,7 @@ sync: ...@@ -8,7 +8,7 @@ sync:
# cron_enabled (pls) # cron_enabled (pls)
cron_enable: false cron_enable: false
cron_at: '0 12,23 * * *' cron_at: '0 12,23 * * *'
repository: 'https://m3p2.ljbac.com/m3p2/courses.git' repository: 'https://gitlab.m3p2.com/m3p2/courses.git'
user: Goutte user: Goutte
password: password:
webhook: /git-sync webhook: /git-sync
...@@ -22,6 +22,6 @@ git: ...@@ -22,6 +22,6 @@ git:
author: gituser author: gituser
message: '(Grav GitSync) Automatic Commit' message: '(Grav GitSync) Automatic Commit'
name: GitSync name: GitSync
email: m3p2-bot@ljbac.com email: bot@m3p2.com
bin: git bin: git
logging: false logging: false
Subproject commit c224285fe23da3c7f8ff8b0b1328aee0deb76461 Subproject commit 8b6220f82ebb9e9bec20cb787f1e8eec1c6b7e27
...@@ -6,7 +6,7 @@ author: ...@@ -6,7 +6,7 @@ author:
name: Antoine Goutenoir name: Antoine Goutenoir
email: antoine@goutenoir.com email: antoine@goutenoir.com
homepage: https://github.com/goutte/grav-plugin-gitlab-markdown-adapter homepage: https://github.com/goutte/grav-plugin-gitlab-markdown-adapter
demo: https://m3p2.ljbac.com demo: https://gitlab.m3p2.com
keywords: grav, plugin, gitlab, markdown, mermaid, latex keywords: grav, plugin, gitlab, markdown, mermaid, latex
bugs: https://github.com/goutte/grav-plugin-gitlab-markdown-adapter/issues bugs: https://github.com/goutte/grav-plugin-gitlab-markdown-adapter/issues
docs: https://github.com/goutte/grav-plugin-gitlab-markdown-adapter/blob/develop/README.md docs: https://github.com/goutte/grav-plugin-gitlab-markdown-adapter/blob/develop/README.md
......
...@@ -6,7 +6,7 @@ author: ...@@ -6,7 +6,7 @@ author:
name: Antoine Goutenoir name: Antoine Goutenoir
email: antoine@goutenoir.com email: antoine@goutenoir.com
homepage: https://github.com/goutte/grav-plugin-m3p2 homepage: https://github.com/goutte/grav-plugin-m3p2
demo: http://courses.m3p2.ljbac.com demo: http://m3p2.com
keywords: grav, plugin, etc keywords: grav, plugin, etc
bugs: https://github.com/goutte/grav-plugin-m3p2/issues bugs: https://github.com/goutte/grav-plugin-m3p2/issues
docs: https://github.com/goutte/grav-plugin-m3p2/blob/develop/README.md docs: https://github.com/goutte/grav-plugin-m3p2/blob/develop/README.md
......
...@@ -131,7 +131,7 @@ class M3P2Plugin extends Plugin ...@@ -131,7 +131,7 @@ class M3P2Plugin extends Plugin
public function getWebIdeUrlForPage(Page $page) public function getWebIdeUrlForPage(Page $page)
{ {
$url = "https://m3p2.ljbac.com/-/ide/project/m3p2/courses/edit/master/-/"; # todo: move to YAML config $url = "https://gitlab.m3p2.com/-/ide/project/m3p2/courses/edit/master/-/"; # todo: move to YAML config
$url .= substr($page->filePathClean(), 11); // 11==strlen('/user/pages') $url .= substr($page->filePathClean(), 11); // 11==strlen('/user/pages')
return $url; return $url;
......
...@@ -8,7 +8,7 @@ author: ...@@ -8,7 +8,7 @@ author:
name: Antoine Goutenoir name: Antoine Goutenoir
email: antoine@goutenoir.com email: antoine@goutenoir.com
homepage: https://github.com/Goutte/grav-plugin-markdown-underline homepage: https://github.com/Goutte/grav-plugin-markdown-underline
demo: https://courses.m3p2.ljbac.com demo: https://m3p2.com
keywords: grav, plugin, markdown, underline, override, inline, block keywords: grav, plugin, markdown, underline, override, inline, block
bugs: https://github.com/Goutte/grav-plugin-markdown-underline/issues bugs: https://github.com/Goutte/grav-plugin-markdown-underline/issues
docs: https://github.com/Goutte/grav-plugin-markdown-underline/blob/develop/README.md docs: https://github.com/Goutte/grav-plugin-markdown-underline/blob/develop/README.md
......
...@@ -3,10 +3,11 @@ ...@@ -3,10 +3,11 @@
<p> <p>
<i class="fa fa-code"></i> <i class="fa fa-code"></i>
with <i class="fa fa-heart-o pulse"></i> with <i class="fa fa-heart-o pulse"></i>
by <a href="/authors" class="science"><i class="fa fa-flask"></i></a>. by <a href="/authors" class="science"><i class="fa fa-flask"></i></a>
and <a href="https://antoine.goutenoir.com" class="ljbac"><i class="fa fa-cube"></i></a>.
{% if false %} {% if false %}
<a href="/admin" class="admin-link">Access admin page</a>. &mdash;
{% else %} <a href="/admin" class="admin-link">Admin</a>
{% endif %} {% endif %}
</p> </p>
</section> </section>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment