cgit support

1 files changed, 47 insertions, 18 deletions

diff --git a/selfpublish.sh b/selfpublish.sh
index 9de446c..b2bb375 100644
--- a/selfpublish.sh
+++ b/selfpublish.sh
@@ -52,7 +52,7 @@ control_file()
     cat <<EOF
 Package: selfpublish-dot-sh-deps
 Depends: apache2 (>= 2.4.46), libssl1.1 (>= 1.1.1d),
- fortune-mod, fortunes-min, curl
+ fortune-mod, fortunes-min, curl, cgit
 Description: selfpublish.sh dependency package
  This package depends on the dependencies of the
  selfpublish.sh script, and is installed by that
@@ -214,7 +214,7 @@ wait_for_certificate_issuance()
         done
 }
 
-install_apache_site()
+install_apache_vhost()
 {
         if [ -e "$SITE_CONF" ] && ! force
         then
@@ -248,6 +248,22 @@ install_self_to_site()
         fi
 }
 
+write_cgit_config()
+{
+    cgit_scan_dir=$SITE_DIR/public_git/
+    mkdir -p "$cgit_scan_dir"
+    line="scan-path=$cgit_scan_dir"
+    grep -xF "$line" /etc/cgitrc || printf '%s\n' "$line" >> /etc/cgitrc
+}
+
+configure_apache_vhost()
+{
+    enable_apache_modules
+    install_self_to_site
+    install_header_to_site
+    write_cgit_config
+}
+
 install_header_to_site()
 {
     cat > "$SITE_DIR"/public_html/HEADER.html <<EOF
@@ -261,26 +277,40 @@ install_header_to_site()
                 </tr>
                 <tr>
                 <td>
-                <td style='border: 1px solid; padding: 6px;'> git&nbsp;repository:
-                <td style='padding: 6px'> <div style='font-size: 15px; padding: 1px;'>
+                <td style='padding: 6px;'> git&nbsp;repository:
+                <tr>
+                <td>
+                <td>
+                <td style='border: 1px solid; padding: 6px'> <div style='font-size: 15px; padding: 1px;'>
                      git&nbsp;clone&nbsp;ssh://d@cryptonomic.net:public_html/selfpublish.sh/<br>
                      </div>
                 <tr>
                 <td>
-                <td style='padding: 6px'> git&nbsp;repository&nbsp;browser:
+                <td style='padding: 6px;'> git&nbsp;repository&nbsp;browser:
+                <tr>
+                <td>
+                <td>
                 <td style='border: 1px solid; padding: 6px;'> <div style='font-size: 15px; padding: 1px;'>
-                     <a href="https://git.cryptonomic.net/selfpublish.sh">
+                     upstream: <a href="https://git.cryptonomic.net/selfpublish.sh">
                      https://git.cryptonomic.net/selfpublish.sh/
                      </a> </div>
                 <tr>
                 <td>
-                <td style='border: 1px solid; padding: 6px;'> this&nbsp;web&nbsp;server:
-                <td style='padding: 6px'> <div style='font-size: 15px; padding: 1px;'>
+                <td>
+                <td style='border: 1px solid; padding: 6px;'> <div style='font-size: 15px; padding: 1px;'>
+                     local: <a href="git/selfpublish.sh">
+                     https://<!--#echo var="SERVER_NAME" -->/git/selfpublish.sh
+                     </a> </div>
+                <tr>
+                <td>
+                <td style='padding: 6px;'> this&nbsp;web&nbsp;server:
+                <tr>
+                <td>
+                <td>
+                <td style='border: 1px solid; padding: 6px'> <div style='font-size: 15px; padding: 1px;'>
                      <a href="selfpublish.sh">
                      https://<!--#echo var="SERVER_NAME" -->/selfpublish.sh
                      </a> </div>
-                </td></tr>
-                </div>
                 </table>
             </span>
         </a>
@@ -300,7 +330,7 @@ check_tls()
         curl -s -S -I https://"$1" >/dev/null
 }
 
-equivocate
+[ "$NO_APT" ] || equivocate
 
 APACHE_MODULES='status md rewrite ssl include cgi'
 APACHE_SITE_DIRS='logs public_html'
@@ -320,17 +350,16 @@ esac
 
 if ! check_tls "$DOMAIN" || force
 then
-        equivocate
-        enable_apache_modules
-        install_apache_site
-        install_self_to_site
+        install_apache_vhost
+        configure_apache_vhost
+
         systemctl restart apache2
         wait_for_certificate_issuance "$DOMAIN"
         systemctl reload apache2 || systemctl restart apache2
 else
-        enable_apache_modules
-        install_self_to_site
-        install_header_to_site
+        install_apache_vhost
+        configure_apache_vhost
+        systemctl reload apache2 || systemctl restart apache2
 fi
 
 check_tls "$DOMAIN"