From 1d2d14db6f719d50a95651c99ec19b69279c0ef5 Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Sun, 22 Sep 2019 15:31:37 +0800 Subject: git: Some small updates --- roles/git/handlers/main.yml | 2 + roles/git/tasks/main.yml | 12 ++-- roles/git/templates/cgit/cgitrc.j2 | 135 ------------------------------------- roles/git/templates/cgitrc.j2 | 135 +++++++++++++++++++++++++++++++++++++ 4 files changed, 144 insertions(+), 140 deletions(-) delete mode 100644 roles/git/templates/cgit/cgitrc.j2 create mode 100644 roles/git/templates/cgitrc.j2 (limited to 'roles') diff --git a/roles/git/handlers/main.yml b/roles/git/handlers/main.yml index 6e08be5..8a672f0 100644 --- a/roles/git/handlers/main.yml +++ b/roles/git/handlers/main.yml @@ -1,3 +1,5 @@ --- - name: restart-cgit command: service uwsgi restart cgit + args: + warn: false diff --git a/roles/git/tasks/main.yml b/roles/git/tasks/main.yml index 13c35f2..6bec804 100644 --- a/roles/git/tasks/main.yml +++ b/roles/git/tasks/main.yml @@ -140,7 +140,7 @@ - name: cgit - generate config file template: - src: cgit/cgitrc.j2 + src: cgitrc.j2 dest: "{{ git.cgit.root }}/cgitrc" notify: restart-cgit @@ -167,7 +167,7 @@ owner: "{{ git.user.name }}" mode: 0755 -- name: cgit - setup with uwsgi in rc.conf +- name: uwsgi - setup cgit blockinfile: path: /etc/rc.conf marker: "# {mark} ANSIBLE MANAGED - uwsgi/cgit" @@ -179,8 +179,10 @@ uwsgi_cgit_flags="-L --log-reopen --logfile-chown --cgi /usr/local/www/cgit/cgit.cgi --env CGIT_CONFIG={{ git.cgit.root }}/cgitrc" notify: restart-cgit -- name: enable and start uwsgi +- name: uwsgi - enable and start service command: rcenable uwsgi -- name: start cgit - command: service uwsgi start cgit +- name: uwsgi - restart to make sure cgit is started + service: + name: uwsgi + state: restarted diff --git a/roles/git/templates/cgit/cgitrc.j2 b/roles/git/templates/cgit/cgitrc.j2 deleted file mode 100644 index da5f33f..0000000 --- a/roles/git/templates/cgit/cgitrc.j2 +++ /dev/null @@ -1,135 +0,0 @@ -# -# {{ git.cgit.root }}/cgitrc -# Configuration file for `cgit` served at `code.aaronly.me`. -# See https://git.zx2c4.com/cgit/tree/cgitrc.5.txt -# -# Aaron LI -# 2017-06-19 -# - -# Title and heading of the index page -root-title=Projects from Aaron LI - -# Subheading of the index page -root-desc=The journey is long, but I shall search high and low. - -# More information on the index page -#root-readme={{ git.cgit.root }}/static/about.html - -# File containing the footer that will be included verbatim at -# the bottom of all pages -footer={{ git.cgit.root }}/static/footer.html - - -## -## Static resources (URL configured via Nginx)) -## - -css=/static/cgit.css -logo=/static/logo.png -favicon=/static/favicon.ico - - -## -## Settings -## - -# Root URL for all cgit links -virtual-root=/ - -# Set default clone URL using macro -clone-url=https://git.{{ domains[0].name }}/$CGIT_REPO_URL - -# Allow HTTP transport git clone -enable-http-clone=1 - -# Do NOT show owner on index page -enable-index-owner=0 - -# Show extra links for each repository on the index page -enable-index-links=1 - -# Enable ASCII art commit history graph on the log pages -enable-commit-graph=1 - -# Show number of affected files per commit on the log pages -enable-log-filecount=1 - -# Show number of added/removed lines per commit on the log pages -enable-log-linecount=1 - -# Sort branches by date -branch-sort=age - -# Enable statistics per week, month, and quarter -max-stats=quarter - -# Allow download of tar.bz2 -snapshots=tar.bz2 - - -## -## List of common mimetypes -## - -mimetype.gif=image/gif -mimetype.html=text/html -mimetype.jpg=image/jpeg -mimetype.jpeg=image/jpeg -mimetype.pdf=application/pdf -mimetype.png=image/png -mimetype.svg=image/svg+xml - -# Highlight source code -# Requires `py36-pygments` package -#source-filter=/usr/local/lib/cgit/filters/syntax-highlighting.py -# Requires `highlight` package -source-filter={{ git.cgit.root }}/syntax-highlighting.sh - -# Format markdown, restructuredtext, manpages, text files, and -# html files through the right converters -about-filter=/usr/local/lib/cgit/filters/about-formatting.sh - -# Search for these files in the root of the default branch of -# repositories for coming up with the about page: -readme=:README.md -readme=:readme.md -readme=:README.mkd -readme=:readme.mkd -readme=:README.rst -readme=:readme.rst -readme=:README.html -readme=:readme.html -readme=:README.htm -readme=:readme.htm -readme=:README.txt -readme=:readme.txt -readme=:README -readme=:readme -readme=:INSTALL.md -readme=:install.md -readme=:INSTALL.mkd -readme=:install.mkd -readme=:INSTALL.rst -readme=:install.rst -readme=:INSTALL.html -readme=:install.html -readme=:INSTALL.htm -readme=:install.htm -readme=:INSTALL.txt -readme=:install.txt -readme=:INSTALL -readme=:install - - -## -## Repositories -## - -# NOTE: only the global settings before this directive will be -# applied to each repository. - -project-list={{ git.user.home }}/projects.list -scan-path={{ git.user.home }}/repositories - -# EOF diff --git a/roles/git/templates/cgitrc.j2 b/roles/git/templates/cgitrc.j2 new file mode 100644 index 0000000..da5f33f --- /dev/null +++ b/roles/git/templates/cgitrc.j2 @@ -0,0 +1,135 @@ +# +# {{ git.cgit.root }}/cgitrc +# Configuration file for `cgit` served at `code.aaronly.me`. +# See https://git.zx2c4.com/cgit/tree/cgitrc.5.txt +# +# Aaron LI +# 2017-06-19 +# + +# Title and heading of the index page +root-title=Projects from Aaron LI + +# Subheading of the index page +root-desc=The journey is long, but I shall search high and low. + +# More information on the index page +#root-readme={{ git.cgit.root }}/static/about.html + +# File containing the footer that will be included verbatim at +# the bottom of all pages +footer={{ git.cgit.root }}/static/footer.html + + +## +## Static resources (URL configured via Nginx)) +## + +css=/static/cgit.css +logo=/static/logo.png +favicon=/static/favicon.ico + + +## +## Settings +## + +# Root URL for all cgit links +virtual-root=/ + +# Set default clone URL using macro +clone-url=https://git.{{ domains[0].name }}/$CGIT_REPO_URL + +# Allow HTTP transport git clone +enable-http-clone=1 + +# Do NOT show owner on index page +enable-index-owner=0 + +# Show extra links for each repository on the index page +enable-index-links=1 + +# Enable ASCII art commit history graph on the log pages +enable-commit-graph=1 + +# Show number of affected files per commit on the log pages +enable-log-filecount=1 + +# Show number of added/removed lines per commit on the log pages +enable-log-linecount=1 + +# Sort branches by date +branch-sort=age + +# Enable statistics per week, month, and quarter +max-stats=quarter + +# Allow download of tar.bz2 +snapshots=tar.bz2 + + +## +## List of common mimetypes +## + +mimetype.gif=image/gif +mimetype.html=text/html +mimetype.jpg=image/jpeg +mimetype.jpeg=image/jpeg +mimetype.pdf=application/pdf +mimetype.png=image/png +mimetype.svg=image/svg+xml + +# Highlight source code +# Requires `py36-pygments` package +#source-filter=/usr/local/lib/cgit/filters/syntax-highlighting.py +# Requires `highlight` package +source-filter={{ git.cgit.root }}/syntax-highlighting.sh + +# Format markdown, restructuredtext, manpages, text files, and +# html files through the right converters +about-filter=/usr/local/lib/cgit/filters/about-formatting.sh + +# Search for these files in the root of the default branch of +# repositories for coming up with the about page: +readme=:README.md +readme=:readme.md +readme=:README.mkd +readme=:readme.mkd +readme=:README.rst +readme=:readme.rst +readme=:README.html +readme=:readme.html +readme=:README.htm +readme=:readme.htm +readme=:README.txt +readme=:readme.txt +readme=:README +readme=:readme +readme=:INSTALL.md +readme=:install.md +readme=:INSTALL.mkd +readme=:install.mkd +readme=:INSTALL.rst +readme=:install.rst +readme=:INSTALL.html +readme=:install.html +readme=:INSTALL.htm +readme=:install.htm +readme=:INSTALL.txt +readme=:install.txt +readme=:INSTALL +readme=:install + + +## +## Repositories +## + +# NOTE: only the global settings before this directive will be +# applied to each repository. + +project-list={{ git.user.home }}/projects.list +scan-path={{ git.user.home }}/repositories + +# EOF -- cgit v1.2.2