Commit graph

65 commits

Author SHA1 Message Date
Patrick Marchand 1a7a8e6d5d 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-14 15:43:45 -05:00
Benoît S. 872f1532d5 Merge branch 'shellcheck-web-add' of evolix/evoadmin-web into master 2018-11-07 15:44:47 +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
Benoît S. 2125523cd8 Update suite utilisation en prod 2018-09-06 14:53:41 +02:00
Benoît S. 45ce021a5c For Stretch the awstats Include has changed 2018-06-13 15:22:07 +02:00
Victor LABORIE 353d41a8a6 web_add with php_versions need global var "conf" 2018-05-31 16:38:34 +02: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
Ludovic Poujol 580ff1307e Add robots.txt 2017-10-16 11:53:45 +02:00
Gregory Colpart 00e15b32d7 add default_charset exemple in vhost template 2017-09-12 20:15:48 +02:00
Gregory Colpart aaf2316fa5 bye bye php.log 2017-09-08 03:53:53 +02:00
Gregory Colpart 75c341fed9 bye bye pam_auth() 2017-09-08 03:53:42 +02:00
Romain Dessort 882c464405 Fix od_del() when containers are not used 2017-09-07 11:29:31 -04:00
Gregory Colpart 7e804984d1 add gitgnore for local conf 2017-09-01 03:37:39 +02:00
Gregory Colpart 1a2c47986c Put auth hashs in conf file 2017-09-01 03:35:16 +02:00
Gregory Colpart ea4d220a59 Fix old script name after recent features merge 2017-09-01 03:27:24 +02:00
Gregory Colpart 53f280096a Fix in sed replacements 2017-09-01 03:21:28 +02:00
Romain Dessort 5a5063e4cb Add comment for php_versions 2017-08-25 17:22:53 -04: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
Romain Dessort d27490a49f Add dbadmin option in configuration 2017-08-24 13:06:53 -04:00
Benoît S. 1bee32dd65 Merge branch 'web-add-support-nginx-and-apache' 2017-08-23 14:22:42 +02: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
Romain Dessort 483482ab59 Add new features:
- Unix quota management
  - Apache ServerAlias management
  - support for multiple versions of PHP
  - MySQL databases management (new page dbadmin)
2017-08-22 12:50:42 -04:00
Gregory Colpart ee8b8a6437 oops, forget to remove debug code :( 2017-08-20 05:19:56 +02:00
Gregory Colpart 4dca34f979 Fix bug with add ServerAlias ! 2017-08-20 05:17:57 +02:00
Gregory Colpart d7bfd75b76 fix serveralias display 2017-08-20 05:10:36 +02:00
Gregory Colpart 7ed492470c indent + fix typo 2017-08-20 05:05:04 +02:00
Gregory Colpart c5b6db810f introduce bindadmin var to know if we need deal with DNS stuff 2017-08-20 04:41:44 +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
Gregory Colpart d16fe6fd70 set ftpadmin to FALSE by default. and fix typo. 2017-08-20 04:30:30 +02:00
Gregory Colpart 4dc9c63cbc use right session name 2017-08-20 04:11:53 +02:00
Gregory Colpart 6f3a6ccadd Remove PAM bullshit auth for a simple/stupid sha256 static auth 2017-08-20 04:08:06 +02:00