luxfi/pics
1
0
Fork 0
mirror of https://github.com/luxfi/pics.git synced 2026-07-26 21:08:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix nginx config paths to have .conf so they get included by new nginx in debian which only includes *.conf

Browse Source 
Fix path of geoip.mmdb to dbip.mmdb
Fix ssl paths and configs when using letsencrypt, dont use the nginx plugin
Fix writing html of gulp favicon task
This commit is contained in:
Thomas Lynch
2024-10-10 17:21:12 +11:00
parent 031a39e212
commit bd48d5274a
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/nginx/nginx.sh
+5 -5
View File
@@ -48,11 +48,11 @@ geoip: $GEOIP
[[ "$CORRECT" == "n" ]] && echo "Exiting..." && exit;
#ask to overwrite if already exists
if [[ -f /etc/nginx/sites-available/$SITES_AVAILABLE_NAME ]]; then
if [[ -f /etc/nginx/sites-available/$SITES_AVAILABLE_NAME.conf ]]; then
read -p "/etc/nginx/sites-available/$SITES_AVAILABLE_NAME already exists. Continue and overwrite existing configuration? (y/n)" OVERWRITE
[[ "$OVERWRITE" == "n" ]] && echo "Exiting..." && exit;
rm /etc/nginx/sites-available/$SITES_AVAILABLE_NAME
rm /etc/nginx/sites-enabled/$SITES_AVAILABLE_NAME
rm /etc/nginx/sites-available/$SITES_AVAILABLE_NAME.conf
rm /etc/nginx/sites-enabled/$SITES_AVAILABLE_NAME.conf
fi
echo "Stopping nginx..."
@@ -238,8 +238,8 @@ fi
#write the config to file and syymlink to sites-available
echo "Writing main jschan vhost config..."
printf "$JSCHAN_CONFIG" > /etc/nginx/sites-available/$SITES_AVAILABLE_NAME
sudo ln -s -f /etc/nginx/sites-available/$SITES_AVAILABLE_NAME /etc/nginx/sites-enabled/$SITES_AVAILABLE_NAME
printf "$JSCHAN_CONFIG" > /etc/nginx/sites-available/$SITES_AVAILABLE_NAME.conf
sudo ln -s -f /etc/nginx/sites-available/$SITES_AVAILABLE_NAME.conf /etc/nginx/sites-enabled/$SITES_AVAILABLE_NAME.conf
if [ "$NOHTTPS" == "y" ]; then
echo "Adjusting config snippets to support NOHTTPS mode..."
gulpfile.js
+2 -1
View File
@@ -58,7 +58,7 @@ gulp.task('generate-favicon', function(done) {
realFavicon.generateFavicon({
masterPicture: 'gulp/res/icons/master.png',
dest: 'gulp/res/icons',
iconsPath: '/file',
iconsPath: '/file/',
design: {
ios: {
pictureAspect: 'backgroundAndMargin',
@@ -121,6 +121,7 @@ gulp.task('generate-favicon', function(done) {
},
markupFile: FAVICON_DATA_FILE
}, function() {
fs.writeFileSync('gulp/res/icons/html_code.html', JSON.parse(fs.readFileSync(FAVICON_DATA_FILE)).favicon.html_code, 'utf8');
done();
});
});