Skip to content

Commit 7c903a9

Browse files
author
gau1991
committed
Removed more hardcoded values
1 parent e2665dd commit 7c903a9

File tree

4 files changed

+28
-29
lines changed

4 files changed

+28
-29
lines changed

‎ee/cli/plugins/debug.py‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,10 @@ def debug_wp(self):
279279
Log.info(self, "Starting WordPress debug")
280280
open("{0}/htdocs/wp-content/debug.log".format(webroot),
281281
'a').close()
282-
EEShellExec.cmd_exec(self, "chown www-data: {0}/htdocs/wp-"
283-
"content/debug.log".format(webroot))
282+
EEShellExec.cmd_exec(self, "chown {1}: {0}/htdocs/wp-"
283+
"content/debug.log"
284+
"".format(webroot,
285+
EEVariables.ee_php_user))
284286
EEShellExec.cmd_exec(self, "sed -i \"s/define(\'WP_DEBUG\'"
285287
".*/define(\'WP_DEBUG\', true);\\n"
286288
"define(\'WP_DEBUG_DISPLAY\', false);"
@@ -290,9 +292,10 @@ def debug_wp(self):
290292
EEShellExec.cmd_exec(self, "cd {0}/htdocs/ && wp"
291293
" plugin --allow-root install "
292294
"developer".format(webroot))
293-
EEShellExec.cmd_exec(self, "chown -R www-data: {0}/htdocs/"
295+
EEShellExec.cmd_exec(self, "chown -R {1}: {0}/htdocs/"
294296
"wp-content/plugins"
295-
.format(webroot))
297+
.format(webroot,
298+
EEVariables.ee_php_user))
296299
else:
297300
Log.info(self, "WordPress debug log already enabled")
298301

‎ee/cli/plugins/stack.py‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ def post_pref(self, apt_packages, packages):
203203
'/etc/nginx/common')
204204
os.makedirs('/etc/nginx/common')
205205

206-
data = dict()
206+
data = dict(webroot=EEVariables.ee_webroot)
207207
Log.debug(self, 'Writting the nginx configuration to '
208208
'file /etc/nginx/common/acl.conf')
209209
ee_nginx = open('/etc/nginx/common/acl.conf', 'w')
@@ -450,8 +450,9 @@ def post_pref(self, apt_packages, packages):
450450
myfile.write("<?php\nphpinfo();\n?>")
451451

452452
EEFileUtils.chown(self, "{0}22222"
453-
.format(EEVariables.ee_webroot), 'www-data',
454-
'www-data', recursive=True)
453+
.format(EEVariables.ee_webroot),
454+
EEVariables.ee_php_user,
455+
EEVariables.ee_php_user, recursive=True)
455456

456457
EEGit.add(self, ["/etc/php5"], msg="Adding PHP into Git")
457458
EEService.reload_service(self, 'php5-fpm')
@@ -644,7 +645,7 @@ def post_pref(self, apt_packages, packages):
644645
" receive_override_options=no_header_body"
645646
"_checks/\" /etc/postfix/master.cf")
646647

647-
amavis_master = """smtp-amavis unix - - n - 2 smtp
648+
amavis_master = ("""smtp-amavis unix - - n - 2 smtp
648649
-o smtp_data_done_timeout=1200
649650
-o smtp_send_xforward_command=yes
650651
-o disable_dns_lookups=yes
@@ -665,9 +666,9 @@ def post_pref(self, apt_packages, packages):
665666
-o smtpd_hard_error_limit=1000
666667
-o smtpd_client_connection_count_limit=0
667668
-o smtpd_client_connection_rate_limit=0
668-
-o receive_override_options=no_header_body_checks,no_unknown_recipient_checks
669-
-o local_header_rewrite_clients=
670-
"""
669+
-o receive_override_options=no_header_body_checks,""" +
670+
"""no_unknown_recipient_check
671+
-o local_header_rewrite_clients=""")
671672

672673
with open("/etc/postfix/master.cf", "a") as am_config:
673674
am_config.write(amavis_master)
@@ -709,11 +710,9 @@ def post_pref(self, apt_packages, packages):
709710
shutil.move('/tmp/phpmyadmin-STABLE/',
710711
'{0}22222/htdocs/db/pma/'
711712
.format(EEVariables.ee_webroot))
712-
Log.debug(self, 'Setting Privileges of www-data:www-data to '
713+
Log.debug(self, 'Setting Privileges of webroot permission to '
713714
'{0}22222/htdocs/db/pma file '
714715
.format(EEVariables.ee_webroot))
715-
# EEShellExec.cmd_exec(self, 'chown -R www-data:www-data '
716-
# '/var/www/22222/htdocs/db/pma')
717716
EEFileUtils.chown(self, '{0}22222'
718717
.format(EEVariables.ee_webroot),
719718
EEVariables.ee_php_user,
@@ -730,8 +729,6 @@ def post_pref(self, apt_packages, packages):
730729
Log.debug(self, "Setting Privileges to "
731730
"{0}22222/htdocs/cache/memcache file"
732731
.format(EEVariables.ee_webroot))
733-
# EEShellExec.cmd_exec(self, 'chown -R www-data:www-data '
734-
# '/var/www/22222/htdocs/cache/memcache')
735732
EEFileUtils.chown(self, '{0}22222'
736733
.format(EEVariables.ee_webroot),
737734
EEVariables.ee_php_user,
@@ -757,11 +754,9 @@ def post_pref(self, apt_packages, packages):
757754
"/usr/bin/dot\'\" {0}22222/htdocs/"
758755
"php/webgrind/config.php"
759756
.format(EEVariables.ee_webroot))
760-
Log.debug(self, "Setting Privileges of www-data:www-data to "
757+
Log.debug(self, "Setting Privileges of webroot permission to "
761758
"{0}22222/htdocs/php/webgrind/ file "
762759
.format(EEVariables.ee_webroot))
763-
# EEShellExec.cmd_exec(self, 'chown -R www-data:www-data '
764-
# '/var/www/22222/htdocs/php/webgrind/')
765760
EEFileUtils.chown(self, '{0}22222'
766761
.format(EEVariables.ee_webroot),
767762
EEVariables.ee_php_user,
@@ -858,7 +853,8 @@ def post_pref(self, apt_packages, packages):
858853

859854
# Custom Vimbadmin configuration by EasyEngine
860855
data = dict(salt=vm_salt, host=EEVariables.ee_mysql_host,
861-
password=vm_passwd)
856+
password=vm_passwd,
857+
php_user=EEVariables.ee_php_user)
862858
Log.debug(self, 'Writting the ViMbAdmin configuration to '
863859
'file {0}22222/htdocs/vimbadmin/application/'
864860
'configs/application.ini'
@@ -1017,7 +1013,7 @@ def post_pref(self, apt_packages, packages):
10171013
static=False,
10181014
basic=True, wp=False, w3tc=False, wpfc=False,
10191015
wpsc=False, multisite=False, wpsubdir=False,
1020-
webroot='/var/www', ee_db_name='',
1016+
webroot=EEVariables.ee_webroot, ee_db_name='',
10211017
ee_db_user='', ee_db_pass='', ee_db_host='',
10221018
rc=True)
10231019

‎ee/cli/templates/22222.mustache‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ server {
77
access_log /var/log/nginx/22222.access.log rt_cache;
88
error_log /var/log/nginx/22222.error.log;
99
10-
ssl_certificate /var/www/22222/cert/22222.crt;
11-
ssl_certificate_key /var/www/22222/cert/22222.key;
10+
ssl_certificate {{webroot}}22222/cert/22222.crt;
11+
ssl_certificate_key {{webroot}}22222/cert/22222.key;
1212

1313
# Force HTTP to HTTPS
1414
error_page 497 =200 https://$host:22222$request_uri;
1515

16-
root /var/www/22222/htdocs;
16+
root {{webroot}}22222/htdocs;
1717
index index.php index.htm index.html;
1818

1919
# Turn on directory listing
@@ -45,16 +45,16 @@ server {
4545
}
4646

4747
location ~* \.(js|css|jpg|gif|png)$ {
48-
root /var/www/22222/htdocs/;
48+
root {{webroot}}22222/htdocs/;
4949
}
5050

5151
location ~* /vimbadmin/public/(.*)/(.*) {
52-
root /var/www/22222/htdocs/vimbadmin/public;
52+
root {{webroot}}22222/htdocs/vimbadmin/public;
5353
try_files $uri $uri/ /vimbadmin/public/index.php?$args;
5454
}
5555

5656
location ~* /vimbadmin/public/(.*) {
57-
root /var/www/22222/htdocs/vimbadmin/public;
57+
root {{webroot}}22222/htdocs/vimbadmin/public;
5858
try_files $uri $uri/ /vimbadmin/public/index.php?$args;
5959
}
6060

‎ee/cli/templates/vimbadmin.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -628,8 +628,8 @@ resources.session.remember_me_seconds = 3600
628628
resources.session.name = 'VIMBADMIN3'
629629

630630
ondemand_resources.logger.writers.stream.path = APPLICATION_PATH "/../var/log"
631-
ondemand_resources.logger.writers.stream.owner = www-data
632-
ondemand_resources.logger.writers.stream.group = www-data
631+
ondemand_resources.logger.writers.stream.owner = {{php_user}}
632+
ondemand_resources.logger.writers.stream.group = {{php_user}}
633633
ondemand_resources.logger.writers.stream.mode = single
634634
ondemand_resources.logger.writers.stream.logname = vimbadmin.log
635635

0 commit comments

Comments
 (0)