Skip to content

Commit f1c5a3e

Browse files
jessuppijessuppi
committed
Refactor web tree permissions
1 parent 995d79d commit f1c5a3e

15 files changed

Lines changed: 181 additions & 196 deletions

‎bash/archive/ss-install-wordpress-core.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ fi
105105
## prepare new files ##
106106
ss_cp "${TMP_WORDPRESS_ZIP}" /var/www/html
107107
ss_unzip /var/www/html/wordpress.zip -d /var/www/html
108-
chown -R www-data:slickstack /var/www/html/wordpress
108+
chown -R www-data:www-data /var/www/html/wordpress
109109
ss_chmod 775 /var/www/html/wordpress
110110

111111
## install new files ##
@@ -121,12 +121,12 @@ ss_rm /tmp/master*.zip*
121121
ss_wget "${TMP_HOVERCRAFT_ZIP}" "${GITHUB_HOVERCRAFT_ZIP}"
122122
ss_unzip "${TMP_HOVERCRAFT_ZIP}" -d /tmp
123123
ss_mv /tmp/hovercraft-master /tmp/hovercraft
124-
chown -R www-data:slickstack /tmp/hovercraft
124+
chown -R www-data:www-data /tmp/hovercraft
125125
ss_chmod 775 /tmp/hovercraft
126126
ss_mkdir /var/www/html/wp-content/themes/hovercraft
127127
ss_rm /var/www/html/wp-content/themes/hovercraft/*
128128
ss_rsync /tmp/hovercraft/* /var/www/html/wp-content/themes/hovercraft
129-
chown -R www-data:slickstack /var/www/html/wp-content/themes/hovercraft
129+
chown -R www-data:www-data /var/www/html/wp-content/themes/hovercraft
130130
ss_chmod 775 /var/www/html/wp-content/themes/hovercraft
131131
ss_rm /tmp/hovercraft*
132132
ss_rm /tmp/master*.zip*
@@ -156,7 +156,7 @@ if [[ "${STAGING_SITE}" == "true" ]]; then
156156
## prepare new files ##
157157
ss_cp "${TMP_WORDPRESS_ZIP}" /var/www/html/staging
158158
ss_unzip /var/www/html/staging/wordpress.zip -d /var/www/html/staging
159-
chown -R www-data:slickstack /var/www/html/staging/wordpress
159+
chown -R www-data:www-data /var/www/html/staging/wordpress
160160
ss_chmod 775 /var/www/html/staging/wordpress
161161

162162
## install new files files ##
@@ -193,7 +193,7 @@ if [[ "${DEV_SITE}" == "true" ]]; then
193193
## prepare new files ##
194194
ss_cp "${TMP_WORDPRESS_ZIP}" /var/www/html/dev
195195
ss_unzip /var/www/html/dev/wordpress.zip -d /var/www/html/dev
196-
chown -R www-data:slickstack /var/www/html/dev/wordpress
196+
chown -R www-data:www-data /var/www/html/dev/wordpress
197197
ss_chmod 775 /var/www/html/dev/wordpress
198198

199199
## install new files ##

‎bash/archive/ss-perms-wordpress-core.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ ss_echo "${COLOR_INFO}Running ss-perms-wordpress-core... ${COLOR_RESET}"
5959
## keep in mind that non-WordPress Core files are not affected by this snippet ##
6060

6161
## all environments ##
62-
ss_chown "${SFTP_USER}":slickstack /var/www/html
62+
ss_chown "${SFTP_USER}":www-data /var/www/html
6363
chmod 0775 /var/www/html ## must be 0775 (0755 not enough)
6464
find /var/www/html/ -type d -exec chmod 0775 {} \; ## must be 0775 (0755 not enough)
6565
find /var/www/html/ -type f -exec chmod 0664 {} \; ## must be 0664 (0644 not enough)

‎bash/ss-functions.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1535,8 +1535,8 @@ PACKAGE_EXIFTOOL="libimage-exiftool-perl"
15351535
#### I. SS-Functions: File Permissions Shorthand ###################################################
15361536
####################################################################################################
15371537

1538-
OWNER_GROUP_PUBLIC_HTML="www-data:slickstack"
1539-
OWNER_GROUP_SFTP_FRIENDLY="${SFTP_USER}:slickstack"
1538+
OWNER_GROUP_PUBLIC_HTML="www-data:www-data"
1539+
OWNER_GROUP_SFTP_FRIENDLY="${SFTP_USER}:www-data"
15401540

15411541
####################################################################################################
15421542
#### J. SS-Functions: SlickStack Functions #########################################################

‎bash/ss-import-database.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ if [[ "${response}" =~ ^[Yy]([Ee][Ss])?$ ]]; then
8484
ss_echo "Found import.sql. Proceeding to overwrite the database."
8585

8686
## fix ownership and permissions ##
87-
ss_chown "${SFTP_USER}":slickstack "/tmp/import.sql"
87+
ss_chown "${SFTP_USER}":www-data "/tmp/import.sql"
8888
ss_chmod 0660 "/tmp/import.sql"
8989

9090
## import sql into database ##
@@ -111,7 +111,7 @@ if [[ "${response}" =~ ^[Yy]([Ee][Ss])?$ ]]; then
111111
ss_echo "Found import.sql.zip. Proceeding to overwrite the database."
112112

113113
## fix ownership and permissions ##
114-
ss_chown "${SFTP_USER}":slickstack "/tmp/import.sql.zip"
114+
ss_chown "${SFTP_USER}":www-data "/tmp/import.sql.zip"
115115
ss_chmod 0660 "/tmp/import.sql.zip"
116116

117117
## stream unzip and import sql into database ##
@@ -138,7 +138,7 @@ if [[ "${response}" =~ ^[Yy]([Ee][Ss])?$ ]]; then
138138
ss_echo "Found import.sql.gz. Proceeding to overwrite the database."
139139

140140
## fix ownership and permissions ##
141-
ss_chown "${SFTP_USER}":slickstack "/tmp/import.sql.gz"
141+
ss_chown "${SFTP_USER}":www-data "/tmp/import.sql.gz"
142142
ss_chmod 0660 "/tmp/import.sql.gz"
143143

144144
## stream gunzip and import sql into database ##

‎bash/ss-import-files.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ if [[ "$response" =~ ^([yY][eE][sS]|[yY])$ ]]; then
7575
ss_chown "${SFTP_USER}":www-data /tmp/import.tar
7676
chmod 0644 /tmp/import.tar
7777
ss_mkdir /var/www/html
78-
ss_chown "${SFTP_USER}":slickstack /var/www/html
78+
ss_chown "${SFTP_USER}":www-data /var/www/html
7979
chmod 0775 /var/www/html ## must be 0775 (0755 not enough)
8080
ss_untar /tmp/import.tar --strip-components=1 -C /var/www/html
8181

@@ -96,7 +96,7 @@ if [[ "$response" =~ ^([yY][eE][sS]|[yY])$ ]]; then
9696
ss_chown "${SFTP_USER}":www-data /tmp/import.tar.gz
9797
chmod 0644 /tmp/import.tar.gz
9898
ss_mkdir /var/www/html
99-
ss_chown "${SFTP_USER}":slickstack /var/www/html
99+
ss_chown "${SFTP_USER}":www-data /var/www/html
100100
chmod 0775 /var/www/html ## must be 0775 (0755 not enough)
101101
ss_untargz /tmp/import.tar.gz --strip-components=1 -C /var/www/html
102102

‎bash/ss-install-wordpress-hovercraft.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ ss_rm /tmp/master*.zip*
7777
ss_wget "${TMP_HOVERCRAFT_ZIP}" "${GITHUB_HOVERCRAFT_ZIP}"
7878
ss_unzip "${TMP_HOVERCRAFT_ZIP}" -d /tmp
7979
ss_mv /tmp/hovercraft-master /tmp/hovercraft
80-
chown -R www-data:slickstack /tmp/hovercraft
80+
chown -R www-data:www-data /tmp/hovercraft
8181
ss_chmod 775 /tmp/hovercraft
8282
ss_mkdir /var/www/html/wp-content/themes/hovercraft
8383
ss_rm /var/www/html/wp-content/themes/hovercraft/*
8484
ss_rsync /tmp/hovercraft/* /var/www/html/wp-content/themes/hovercraft
85-
chown -R www-data:slickstack /var/www/html/wp-content/themes/hovercraft
85+
chown -R www-data:www-data /var/www/html/wp-content/themes/hovercraft
8686
ss_chmod 775 /var/www/html/wp-content/themes/hovercraft
8787
ss_rm /tmp/hovercraft*
8888
ss_rm /tmp/master*.zip*

‎bash/ss-install-wordpress-packages.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ find /var/www/html/ -maxdepth 1 -type f ! -name "wp-config.php" -name "*.php" -d
107107
## prepare new files ##
108108
ss_cp "${TMP_WORDPRESS_ZIP}" /var/www/html
109109
ss_unzip /var/www/html/wordpress.zip -d /var/www/html
110-
ss_chown "${SFTP_USER}":slickstack /var/www/html/wordpress
110+
ss_chown www-data:www-data /var/www/html/wordpress
111111
ss_chmod 0775 /var/www/html/wordpress
112112

113113
## delete stock extensions ##
@@ -146,7 +146,7 @@ find /var/www/html/staging/ -maxdepth 1 -type f ! -name "wp-config.php" -name "*
146146
## prepare new files ##
147147
ss_cp "${TMP_WORDPRESS_ZIP}" /var/www/html/staging
148148
ss_unzip /var/www/html/staging/wordpress.zip -d /var/www/html/staging
149-
ss_chown "${SFTP_USER}":slickstack /var/www/html/staging/wordpress
149+
ss_chown www-data:www-data /var/www/html/staging/wordpress
150150
ss_chmod 0775 /var/www/html/staging/wordpress
151151

152152
## delete stock extensions ##
@@ -186,7 +186,7 @@ find /var/www/html/dev/ -maxdepth 1 -type f ! -name "wp-config.php" -name "*.php
186186
## prepare new files ##
187187
ss_cp "${TMP_WORDPRESS_ZIP}" /var/www/html/dev
188188
ss_unzip /var/www/html/dev/wordpress.zip -d /var/www/html/dev
189-
ss_chown "${SFTP_USER}":slickstack /var/www/html/dev/wordpress
189+
ss_chown www-data:www-data /var/www/html/dev/wordpress
190190
ss_chmod 0775 /var/www/html/dev/wordpress
191191

192192
## delete stock extensions ##

‎bash/ss-perms-nginx-config.txt‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ ss_touch /var/www/meta/.htpasswd
7171

7272
## chown dirs ##
7373
ss_chown www-data:www-data /var/www/cache/nginx ## must be www-data:www-data
74-
chown "${SFTP_USER}":slickstack /var/www/html ## must be SFTP_USER:slickstack
74+
chown "${SFTP_USER}":www-data /var/www/html ## must be SFTP_USER:www-data
7575
chown root:www-data /var/www/logs ## must be root:www-data
7676
chown root:www-data /var/www/meta ## must be root:www-data
7777
chown root:root /var/www/certs
@@ -89,10 +89,10 @@ chown root:www-data /var/www/meta/.htpasswd ## must be root:www-data
8989
chmod 0755 /var/www/cache/nginx ## 0755 seems enough
9090
chmod 0775 /var/www/html ## must be 0775 (0755 not enough)
9191
chmod 0775 /var/www/logs ## 0755 should also work
92-
chmod 0775 /var/www/meta ## 0755 should also work
93-
ss_chmod 0775 /var/www/sites ## 0755 should also work
94-
ss_chmod 0775 /var/www/sites/includes ## 0755 should also work
95-
ss_chmod 0775 /var/www/sites/error_pages ## 0755 should also work
92+
chmod 0755 /var/www/meta ## must be 0755
93+
ss_chmod 0755 /var/www/sites ## must be 0755
94+
ss_chmod 0755 /var/www/sites/includes ## must be 0755
95+
ss_chmod 0755 /var/www/sites/error_pages ## must be 0755
9696

9797
## chmod files ##
9898
ss_chmod 0640 /var/www/meta/.htpasswd ## must be 0640
@@ -110,8 +110,26 @@ ss_chmod 0660 /var/www/logs/nginx*.log ## must be 0660
110110

111111
## cloudflare.ini ##
112112
if [[ -f /var/www/meta/cloudflare.ini ]]; then
113-
chmod 600 /var/www/meta/cloudflare.ini
114-
chown root:root /var/www/meta/cloudflare.ini
113+
chown root:root /var/www/meta/cloudflare.ini ## must be root:root
114+
chmod 0600 /var/www/meta/cloudflare.ini ## must be 0600
115+
fi
116+
117+
## rclone.conf ##
118+
if [[ -f /var/www/meta/rclone.conf ]]; then
119+
chown root:root /var/www/meta/rclone.conf ## must be root:root
120+
chmod 0600 /var/www/meta/rclone.conf ## must be 0600
121+
fi
122+
123+
## adminer.php ##
124+
if [[ -f /var/www/meta/adminer.php ]]; then
125+
chown root:www-data /var/www/meta/adminer.php ## must be root:www-data
126+
chmod 0640 /var/www/meta/adminer.php ## must be 0640
127+
fi
128+
129+
## maintenance.html ##
130+
if [[ -f /var/www/meta/maintenance.html ]]; then
131+
chown root:www-data /var/www/meta/maintenance.html ## must be root:www-data
132+
chmod 0644 /var/www/meta/maintenance.html ## must be 0644
115133
fi
116134

117135
####################################################################################################

‎bash/ss-perms-php-config.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ fi
8383
if [ ! -f "/var/www/logs/php-error.log" ]; then ss_touch "/var/www/logs/php-error.log"; fi
8484

8585
chown www-data:www-data /var/www/logs/php-error.log
86-
chmod 0640 /var/www/logs/php-error.log ## must be 0640
86+
chmod 0660 /var/www/logs/php-error.log ## must be 0660
8787

8888
####################################################################################################
8989
#### D. SS-Perms-PHP-Config: Reset Permissions (Adminer.php) #######################################

‎bash/ss-perms-php-packages.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ fi
127127

128128
if [ ! -f "/var/www/logs/php-error.log" ]; then ss_touch "/var/www/logs/php-error.log"; fi
129129
chown www-data:www-data /var/www/logs/php-error.log
130-
chmod 0640 /var/www/logs/php-error.log ## must be 0640
130+
chmod 0660 /var/www/logs/php-error.log ## must be 0660
131131

132132
####################################################################################################
133133
#### SlickStack: Reset Permissions (SlickStack Scripts) ############################################

0 commit comments

Comments
 (0)