[Git][java-team/pkg-java-blog][master] 2 commits: Fixed the link to the feed

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / pkg-java-blog


Commits:
5e688ceb by Emmanuel Bourg at 2018-05-03T16:22:43+02:00
Fixed the link to the feed

- - - - -
5add89b7 by Emmanuel Bourg at 2018-05-03T16:22:43+02:00
Replaced the deployment to Alioth with the Gitlab Pages on Salsa

- - - - -


4 changed files:

- + .gitlab-ci.yml
- Makefile
- README.txt
- theme-bits/templates/base.html


Changes:

=====================================
.gitlab-ci.yml
=====================================
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,11 @@
+image: debian:9
+
+pages:
+  script:
+  - apt-get update -qq && apt-get install -qq pelican
+  - make html
+  artifacts:
+    paths:
+    - output
+  only:
+  - master


=====================================
Makefile
=====================================
--- a/Makefile
+++ b/Makefile
@@ -8,11 +8,6 @@ OUTPUTDIR=$(BASEDIR)/output
 CONFFILE=$(BASEDIR)/pelicanconf.py
 PUBLISHCONF=$(BASEDIR)/publishconf.py
 
-SSH_HOST=alioth.debian.org
-SSH_PORT=22
-SSH_USER=
-SSH_TARGET_DIR=/srv/home/groups/pkg-java/htdocs/blog
-
 DEBUG ?= 0
 ifeq ($(DEBUG), 1)
 	PELICANOPTS += -D
@@ -35,7 +30,6 @@ help:
 	@echo '   make serve-global [SERVER=0.0.0.0]  serve (as root) to $(SERVER):80    '
 	@echo '   make devserver [PORT=8000]          start/restart develop_server.sh    '
 	@echo '   make stopserver                     stop local server                  '
-	@echo '   make upload                         upload the web site via rsync+ssh  '
 	@echo '                                                                          '
 	@echo 'Set the DEBUG variable to 1 to enable debugging, e.g. make DEBUG=1 html   '
 	@echo 'Set the RELATIVE variable to 1 to enable relative urls                    '
@@ -79,13 +73,4 @@ stopserver:
 publish:
 	$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS)
 
-ssh_upload: publish
-	scp -P $(SSH_PORT) -r $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
-
-rsync_upload: publish
-	rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --delete $(OUTPUTDIR)/ $(SSH_HOST):$(SSH_TARGET_DIR) --cvs-exclude --perms --chmod=g+w
-	ssh $(SSH_HOST) 'chgrp --quiet -R pkg-java $(SSH_TARGET_DIR)'
-
-upload: rsync_upload
-
-.PHONY: html help clean regenerate serve serve-global devserver publish ssh_upload rsync_upload upload
+.PHONY: html help clean regenerate serve serve-global devserver publish


=====================================
README.txt
=====================================
--- a/README.txt
+++ b/README.txt
@@ -15,10 +15,14 @@ Updating the blog
 
 2. Edit the content of the file
 
-3. Push the changes to the Git repository on Alioth
+3. Push the changes to the Git repository on Salsa
 
 4. Ask the other team members to review the article
 
 5. Change the status of the article from 'draft' to 'published'
 
-6. Publish the site with 'make upload'
+6. Run 'make html' to generate the pages
+
+7. Commit and push the final changes to Salsa
+
+8. Wait for the Gitlab job to regenerate the site


=====================================
theme-bits/templates/base.html
=====================================
--- a/theme-bits/templates/base.html
+++ b/theme-bits/templates/base.html
@@ -47,9 +47,9 @@
                 {% endif %}
 
                 <li><a href="{{ SITEURL }}/archives.html">Archives</a>
-                <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" rel="alternate">Atom feed</a></li>
+                <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" rel="alternate">Atom feed</a></li>
                 {% if FEED_RSS %}
-                <li><a href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" rel="alternate">RSS feed</a></li>
+                <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" rel="alternate">RSS feed</a></li>
                 {% endif %}
                 </ul>
             </div>



View it on GitLab: https://salsa.debian.org/java-team/pkg-java-blog/compare/d20dfee429926821da32406072f7e5ed6356a32f...5add89b7eb29c9bf6db2e0875f0bcc82182ac647

---
View it on GitLab: https://salsa.debian.org/java-team/pkg-java-blog/compare/d20dfee429926821da32406072f7e5ed6356a32f...5add89b7eb29c9bf6db2e0875f0bcc82182ac647
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180503/12cd51c8/attachment.html>