Skip to content

Commit

Permalink
p3x-robot sunday release 2018-5-12 19:50:58
Browse files Browse the repository at this point in the history
  • Loading branch information
p3x-robot committed May 12, 2018
1 parent f533c6e commit 8748c6b
Show file tree
Hide file tree
Showing 112 changed files with 144 additions and 170 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ node_modules
node_modules/.yarn-integrity


/webpack
/public/webpack
2 changes: 0 additions & 2 deletions .yarnrc

This file was deleted.

16 changes: 8 additions & 8 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const fsExtra = require('fs-extra');

module.exports = function (grunt) {

const themeDir = './assets/less/theme';
const themeDir = './public/less/theme';

const filesLess = {
}
Expand All @@ -14,14 +14,14 @@ module.exports = function (grunt) {
const themes = ['default'];
const excluded = ['fonts'];
const themeCss = {
'bootstrap-default': '/assets/css/bootstrap-default.css',
'bootstrap-default': '/css/bootstrap-default.css',
}

for(let path of watches) {
const stat = fs.statSync(`${root}/${path}`);
if (stat.isDirectory() && !excluded.includes(path)) {
themes.push(path);
themeCss[`bootstrap-${path}`] = `/assets/css/bootstrap-${path}.css`;
themeCss[`bootstrap-${path}`] = `/css/bootstrap-${path}.css`;
}
}
fsExtra.ensureDirSync(themeDir);
Expand All @@ -45,12 +45,12 @@ module.exports = function (grunt) {

}
// console.log(less)
filesLess[`assets/css/bootstrap-${theme}.css`] = less;
filesLess[`public/css/bootstrap-${theme}.css`] = less;

}


fs.writeFileSync(`./assets/js/themes.js`, `
fs.writeFileSync(`./public/js/themes.js`, `
module.exports = ${JSON.stringify(themeCss, null, 4)}
`);

Expand All @@ -75,7 +75,7 @@ module.exports = ${JSON.stringify(themeCss, null, 4)}
themeDir
],
fonts: [
'assets/fonts'
'public/fonts'
]
*/
},
Expand All @@ -88,7 +88,7 @@ module.exports = ${JSON.stringify(themeCss, null, 4)}
src: [
'**',
],
dest: './webpack/assets/twemoji/svg'
dest: './public/webpack/assets/twemoji/svg'
},

]
Expand All @@ -106,7 +106,7 @@ module.exports = ${JSON.stringify(themeCss, null, 4)}

watch: {
less: {
files: ['assets/less/*.*'],
files: ['public/assets/less/*.*'],
tasks: ['less'],
options: {
atBegin: true,
Expand Down
77 changes: 73 additions & 4 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ That's it, installation complete!

Apache is the "default" webserver for GitList. You will find the configuration inside the `.htaccess` file. However, nginx and lighttpd are also supported.

To make it to be more secure:
All `PHP` files will be in the `root` and only `index.php`, `images`, `icons`, `svg`, `css`, `js`bundle files will be in the `public` subdir.

### nginx server.conf

```
Expand All @@ -30,7 +33,7 @@ server {
access_log /var/log/nginx/MYSERVER.access.log combined;
error_log /var/log/nginx/MYSERVER.error.log error;
root /var/www/DIR;
root /var/www/DIR/public;
index index.php;
# auth_basic "Restricted";
Expand Down Expand Up @@ -77,10 +80,73 @@ server {
}
```

### lighttpd
#### Might own NGINX that works with root and subdir as well

```text
server {
server_name gitlist.patrikx3.com;
root /var/www/gitlist.patrikx3.com/public;
location / {
try_files $uri /index.php$is_args$args;
}
location /nested {
alias /var/www/gitlist.patrikx3.com/public;
try_files $uri @nested;
location ~ \.php$ {
include snippets/fastcgi-php.conf;
fastcgi_param SCRIPT_FILENAME $request_filename;
fastcgi_pass unix:/var/run/php/php7.2-fpm.sock;
}
}
location /release {
alias /var/www/gitlist.patrikx3.com/build/release/public;
try_files $uri @release;
location ~ \.php$ {
include snippets/fastcgi-php.conf;
fastcgi_param SCRIPT_FILENAME $request_filename;
fastcgi_pass unix:/var/run/php/php7.2-fpm.sock;
}
}
location @nested {
rewrite /nested/(.*)$ /nested/index.php?/$1 last;
}
location @release {
rewrite /release/(.*)$ /release/index.php?/$1 last;
}
location ~ \.php$ {
include snippets/fastcgi-php.conf;
fastcgi_pass unix:/var/run/php/php7.2-fpm.sock;
}
}
```


### lighthttpd

I do not use `lighthttpd`, but you know what I mean. Make sure only, the `gitlist/public` folder should be enabled.

```
# GitList is located in /var/www/gitlist
# GitList is located in /var/www/gitlist/
server.document-root = "/var/www"
url.rewrite-once = (
Expand All @@ -92,6 +158,9 @@ url.rewrite-once = (

### hiawatha

I do not use `hiawatha`, but you know what I mean. Make sure only, the `gitlist/public` folder should be enabled.


```
UrlToolkit {
ToolkitID = gitlist
Expand All @@ -106,7 +175,7 @@ UrlToolkit {

---

[**GITLIST**](https://pages.corifeus.com/gitlist) Build v1.1.5
[**GITLIST**](https://pages.corifeus.com/gitlist) Build v1.1.6

[![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6) [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact)

Expand Down
12 changes: 10 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@



# 🤖 P3X Gitlist v1.1.5
# 🤖 P3X Gitlist v1.1.6

# Description

Expand All @@ -24,7 +24,15 @@ This is Klaus Silveira's fork, with multiple themes, sub-modules and updated to
Done, just put on your server, nothing to build:
https://github.com/patrikx3/gitlist/releases

## There is a changing break
Before, everything was in the `root` of the web server.

Which is not secure.

For now, you can create a folder eg. `/var/www/gitlist.me.com/` and make sure, that you server does not point to `/var/www/gitlist.me.com/`, but instead, point to `/var/www/gitlist.me.com/public`.

### v1.2.0 - unreleased / in progress

* In submodules, if the "submodule" and "path" is not the same, it chokes (it should work the submodule name and path are not the same)
* Works
* submodule "path/name"
Expand Down Expand Up @@ -100,7 +108,7 @@ npm run less-watch

---

[**GITLIST**](https://pages.corifeus.com/gitlist) Build v1.1.5
[**GITLIST**](https://pages.corifeus.com/gitlist) Build v1.1.6

[![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6) [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact)

Expand Down
9 changes: 7 additions & 2 deletions artifacts/config.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[git]
client = '/usr/bin/git' ; Your git executable path
default_branch = 'master' ; Default branch when HEAD is detached
repositories[] = './git-test' ; Path to your repositories
repositories[] = '../git-test' ; Path to your repositories
; If you wish to add more repositories, just add a new line

; WINDOWS USERS
Expand All @@ -24,7 +24,12 @@ ssh_user = 'git' ; user to use for cloning via SSH
; http remote
show_http_remote = true ; display remote URL for HTTP
use_https = true ; generate URL with https://
url_subdir = '' ; if cloning via HTTP is triggered using virtual dir (e.g. https://example.com/git/repo.git)

; if cloning via HTTP is triggered using virtual dir (e.g. https://example.com/git/repo.git)
; it there is a subdir, start with string and end with trailing slash
; eg clone_subdir = 'subdir/'
clone_subdir = ''

; has to end with trailing slash
http_user = '' ; user to use for cloning via HTTP (default: none)
http_user_dynamic = false ; when enabled, http_user is set to $_SERVER['PHP_AUTH_USER']
Expand Down
2 changes: 1 addition & 1 deletion artifacts/php-7.2-ubuntu.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ sudo apt upgrade -y

---

[**GITLIST**](https://pages.corifeus.com/gitlist) Build v1.1.5
[**GITLIST**](https://pages.corifeus.com/gitlist) Build v1.1.6

[![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6) [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact)

Expand Down
20 changes: 0 additions & 20 deletions assets/js/themes.js

This file was deleted.

110 changes: 0 additions & 110 deletions build.xml

This file was deleted.

Loading

0 comments on commit 8748c6b

Please sign in to comment.