evolix/evoadmin-web
22
0
Fork 1
Code Issues 31 Pull requests 4 Releases 1 Wiki Activity
86 commits 17 branches 1 tag 890 KiB
Commit graph

46 commits

Author SHA1 Message Date
Gregory Colpart 2125055409 Fix when multiples SetHandler lines in VHOST file 2019-02-21 02:31:04 +01:00
Patrick Marchand ea359880cc New check-vhosts command for web-add.sh 
Checks whether the enabled vhosts are all symbolic links, also offers the -f flag to fix any problems automatically.
 2018-12-13 23:29:06 +01:00
Patrick Marchand 21f5f011da Fixed mistake with getopts(1) in web-add.sh 2018-12-13 13:21:13 -05:00
Ludovic Poujol 8429351213 Do not list evoadmin in the vhost list 
Fixes #34
 2018-12-11 15:30:06 +01:00
Patrick Marchand c135807010 Changed API for web-add.sh fix-vhosts 
check-vhosts now only applies changes when it is passed the -f flag,
otherwise it simply lists the suggested fixes.
 2018-12-04 11:25:45 -05:00
Patrick Marchand 53335ee4ef Apply first and third benpro review of web-add fix command 
Simplify sed(1) command by getting rid of echo(1)

Use a2ensite(1) instead of ln(1) to link vhosts.
 2018-11-29 18:42:20 +01:00
Patrick Marchand 5fe9762c53 Inverse userdel(1) calls in scripts/web-add.sh 
When a user has the same name as his primary group, userdel(1) tries
to remove it as well, but stops and prints an error message if that
group is being used by any other users as their primary group. By
deleting the www user first, the group is properly deleted. This
means we can get rid of the subsequent call to groupdel(1).

Tested by adding / removing a vhost on my testing vm.
 2018-11-29 18:35:17 +01:00
Patrick Marchand b693075f39 Adds command to fix vhost linking problems in web-add.sh 
Some people forget to use the --follow-symlinks flag with sed(1),
thus not carrying changes over to /etc/apache2/sites-available.

This new command makes sure all vhosts in /etc/apache2/sites-enabled
are symlinks. It assumes that we always want to overwrite the file in
/etc/apache2/sites-available with the file in /etc/apache2/sites-enabled.
 2018-11-22 20:15:06 +01:00
Patrick Marchand d64cfa4e8b Fix problems with web-add.sh add-alias 
All uses of the VHOST_PATH variable in the code append a slash to
it, so it is easier to remove the trailing slash in it's instantiation.

Also simplifies the sed(1) invocation.
 2018-11-22 20:14:05 +01:00
Patrick Marchand 08ef18bc2d Use ${var:+...} instead of [-n ] and "$@" instead of "$*" 
Fixes issue uncovered by proper use of double quotes.
 2018-10-25 11:37:21 -04:00
Patrick Marchand 540b7f7278 Use ${var:+...} instead of [-n ] and "$@" instead of "$*" 
Fixes issue uncovered by proper use of double quotes
 2018-10-17 16:30:58 -04:00
Patrick Marchand e596e3d520 Use $(..) instead of legacy .. 
https://github.com/koalaman/shellcheck/wiki/SC2006
modified:   scripts/web-add.sh
 2018-10-16 14:51:50 -04:00
Patrick Marchand 97bad77040 Add -r to read 
I'm less certain about the necessity of this, but if it doesnt cause
problems, I dont see why not.
https://github.com/koalaman/shellcheck/wiki/SC2162
modified:   scripts/web-add.sh
 2018-10-16 14:49:43 -04:00
Patrick Marchand 05c9525d7e $/${} is unnecessary on arithmetic variables 
https://github.com/koalaman/shellcheck/wiki/SC2004
modified:   scripts/web-add.sh
 2018-10-16 14:46:16 -04:00
Patrick Marchand f4fae90eb1 Useless cat 
https://github.com/koalaman/shellcheck/wiki/SC2002
modified:   scripts/web-add.sh
 2018-10-16 14:43:26 -04:00
Patrick Marchand 5d2d8be5ad Prefer explicit escaping 
https://github.com/koalaman/shellcheck/wiki/SC1117
modified:   scripts/web-add.sh
 2018-10-16 14:39:23 -04:00
Patrick Marchand 2861d90119 Fixes optional group creation 
The optional group creation flag in scripts/web-add.sh was never used.
 2018-10-16 14:35:23 -04:00
Patrick Marchand 4aa0332639 Use "$@" (with quotes) to prevent whitespace problems 
https://github.com/koalaman/shellcheck/wiki/SC2048
modified:   web-add.sh
 2018-10-16 14:32:47 -04:00
Patrick Marchand 866f20ef47 Adds double quoting to prevent shell globing 
modified:   web-add.sh
 2018-10-16 14:28:27 -04:00
Patrick Marchand 3e422bc2bf Adds shellcheck source comments 
This will allow someone to use shellcheck(1) to automatically check
any referenced code using `shellcheck -x scripts/web-add.sh`
 2018-10-16 14:10:02 -04:00
Jérémy Lecour 25d9f7e7d4 web-add: use group "evolinux-ssh 2018-04-20 11:20:06 +02:00
Jérémy Lecour 637e72743a web-add.sh: whitespaces 2018-04-19 23:02:15 +02:00
Jérémy Lecour 99ee37b408 web-add.sh: use AllowGroups or AllowUsers as needed 2018-04-19 23:02:15 +02:00
Victor LABORIE 9ff6846c36 Fix indentation for .my.cnf 2017-10-17 10:44:58 +02:00
Romain Dessort 882c464405 Fix od_del() when containers are not used 2017-09-07 11:29:31 -04:00
Gregory Colpart 53f280096a Fix in sed replacements 2017-09-01 03:21:28 +02:00
Romain Dessort 5eb619a579 Fix FPM socket path + quota 2017-08-25 17:22:26 -04:00
Romain Dessort 4a28ee1f53 Fix op_del() function for containers 2017-08-25 16:58:04 -04:00
Romain Dessort a5ceadd1d0 Fix FPM socket path 2017-08-25 16:57:38 -04:00
Romain Dessort c166975d46 Use same UID/GID in containers 2017-08-25 16:56:30 -04:00
Romain Dessort 0968dbc797 phpversion and quota options should be optional 2017-08-25 08:48:09 -04:00
Romain Dessort 6b63c02f77 Fix bug related to Apache/Nginx merge 2017-08-25 08:47:42 -04:00
Benoît S. 29bbfab45a Merge web-add-nginx features to web-add 
This add support for apache and nginx in the same script.
 2017-08-23 14:19:48 +02:00
Romain Dessort 623f281628 Add new features in web-add.sh script (related to 483482a): 
- Unix quota management
  - support for multiple versions of PHP running in LXC containers with FPM
  - don't include MySQL information in summary email if no database is created
  - possibility to set custom MySQL connection parameters
  - fix op_listvhost() function since config file now ended with .conf
    and include useful additional informations (PHP version, used disk
    size, vhost enabled).
  - add scripts to manage/report MySQL databases and users (used by
    evoadmin dbadmin.php page)
 2017-08-22 17:29:51 -04:00
Gregory Colpart d7bfd75b76 fix serveralias display 2017-08-20 05:10:36 +02:00
Gregory Colpart 2947fa2c87 NO CODE IN THIS COMMIT. ONLY :retab replacement aka remove-all-tabs-from-code commit 2017-08-20 04:31:00 +02:00
Victor LABORIE a81be287c4 Fix #1768: add/del-alias -> auto-suffix .conf 2016-04-19 17:52:05 +02:00
Benoît S. 7a6c625efa We now use /etc/evolinux to configure web-add.sh. 2015-12-23 15:39:50 +01:00
Gregory Colpart 58725dcc7c fix bug: groupdel when remove account 2015-11-28 23:10:24 +01:00
Gregory Colpart cada24573d Change scripts path 2015-11-28 22:59:36 +01:00
Benoît S. f41e64a2b6 Del operation was invalid for Apache vhost. Fixed. 2015-11-26 10:53:03 +01:00
Romain Dessort 17743c5ba9 Fix a bug when removing an account using web-add.sh del 
All lines matching ${account}* are removed instead of only the good one
in /etc/cron.d/awstats.
 2015-09-24 15:21:25 +02:00
Benoît S. 0b1c452ee5 Fix #1628. Jessie compatibilty. 2015-09-04 10:20:33 +02:00
Romain Dessort e6edffd820 Merge untracked code into evoadmin-web. 2015-08-31 15:18:56 +02:00
Victor LABORIE 63a2f16b27 Fix #1631. Add --follow-symlinks to sed in (add|del)-alias. 2015-08-28 12:33:08 +02:00
Benoît S. 48eb1c16b1 Evoadmin-web is now a "public project". 2015-08-25 16:54:13 +02:00