aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjaseg <code@jaseg.net>2020-12-30 12:11:11 +0100
committerjaseg <code@jaseg.net>2020-12-30 12:11:11 +0100
commit380b48646eafab19af24768309f8e78509c588a1 (patch)
treefcf18f33346742956fbf87c16edf28cb0bd1e913
parent43398704a432822ab2ed7af2ebcd3eb764554554 (diff)
downloadinfra-380b48646eafab19af24768309f8e78509c588a1.tar.gz
infra-380b48646eafab19af24768309f8e78509c588a1.tar.bz2
infra-380b48646eafab19af24768309f8e78509c588a1.zip
Add README
-rw-r--r--README.rst33
-rw-r--r--cgitrc7
-rw-r--r--nginx.conf4
-rw-r--r--setup_git.yml9
4 files changed, 51 insertions, 2 deletions
diff --git a/README.rst b/README.rst
new file mode 100644
index 0000000..d74418d
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,33 @@
+Admin foo howto
+===============
+
+Ansible
+-------
+
+Selectively run ansible playbooks for the git service and webserver setup:
+
+.. code-block::
+
+ ansible-playbook -i inventory.yml -t git,www playbook.yml
+
+Gitolite/CGIT
+-------------
+
+Remove ad-hoc repo from command line:
+
+.. code-block::
+
+ ssh git@git.jaseg.de unlock sjandrakei/pub/usb-remote
+ ssh git@git.jaseg.de D unlock sjandrakei/pub/usb-remote
+
+Set ad-hoc repo description from command line:
+
+.. code-block::
+
+ ssh git@git.jaseg.de desc sjandrakei/pub/kochbuch Bringing analog recipe books into the interwebs
+
+Create ad-hoc repo from command line:
+
+.. code-block::
+
+ git clone git@git.jaseg.de:sjandrakei/pub/repo-to-be-created.git
diff --git a/cgitrc b/cgitrc
index 9b5a651..eebcc09 100644
--- a/cgitrc
+++ b/cgitrc
@@ -1,5 +1,12 @@
css=/cgit.css
logo=/cgit.png
+favicon=/favicon.png
+
+root-title=git.jaseg.de
+root-desc=jaseg's git repositories
+snapshots=tar.gz tar.bz2 zip
+
+clone-url=git@git.jaseg.de:$CGIT_REPO_URL https://git.jaseg.de/$CGIT_REPO_URL
enable-http-clone=1
robots=noindex, nofollow
diff --git a/nginx.conf b/nginx.conf
index d46c394..f14f370 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -396,6 +396,10 @@ http {
alias /var/www/git.jaseg.de/cgit.png;
}
+ location ~ ^/favicon.ico {
+ alias /var/www/git.jaseg.de/favicon.ico;
+ }
+
location / {
include uwsgi_params;
uwsgi_modifier1 9;
diff --git a/setup_git.yml b/setup_git.yml
index d1789bd..2f4c59f 100644
--- a/setup_git.yml
+++ b/setup_git.yml
@@ -1,13 +1,18 @@
- name: Install host requisites
dnf:
- name: cgit,gitolite3,python3-pygments,python3-docutils,nodejs-markdown
+ name: cgit,gitolite3,python3-pygments,python3-docutils,nodejs-markdown,python3-markdown
state: latest
-- name: Copy cgit favicon
+- name: Copy cgit logo
copy:
src: cgit-logo.png
dest: /var/www/git.jaseg.de/cgit.png
+- name: Copy cgit favicon
+ copy:
+ src: cgit-favicon.ico
+ dest: /var/www/git.jaseg.de/favicon.ico
+
- name: Create cgit instance config dir
file:
path: /var/lib/cgit