Installation correction : not sure if it works.
This commit is contained in:
frju365
parent
148e657054
commit
696f504637
2 changed files with 36 additions and 342 deletions
|
|
@ -128,14 +128,6 @@ ynh_add_nginx_config
|
|||
# Create a system user
|
||||
ynh_system_user_create $app
|
||||
|
||||
|
||||
#=================================================
|
||||
# PHP-FPM 7.2 CONFIGURATION
|
||||
#=================================================
|
||||
|
||||
# Create a dedicated php-fpm7.1 config
|
||||
#ynh_add_fpm7.2_config
|
||||
|
||||
#=================================================
|
||||
# SPECIFIC SETUP
|
||||
#=================================================
|
||||
|
|
@ -157,11 +149,6 @@ ynh_replace_string "yunobase" "$db_name" "$final_path/.env"
|
|||
ynh_replace_string "yunomail" "$email" "$final_path/.env"
|
||||
ynh_replace_string "yunodomain" "$domain" "$final_path/.env"
|
||||
|
||||
#init_composer $final_path
|
||||
#( cd $final_path && sudo /usr/bin/php7.2 artisan config:clear )
|
||||
|
||||
db_name=$(ynh_sanitize_dbid $app)
|
||||
|
||||
#==============================================
|
||||
# INSTALL Composer
|
||||
#==============================================
|
||||
|
|
@ -171,49 +158,47 @@ php -r "if (hash_file('sha384', 'composer-setup.php') === '93b54496392c062774670
|
|||
php composer-setup.php --install-dir=/usr/bin --filename=composer
|
||||
php -r "unlink('composer-setup.php');"
|
||||
|
||||
# setup application config
|
||||
(
|
||||
cd $final_path && chmod -R 755 storage/* bootstrap/cache/
|
||||
cd $final_path && composer install --no-dev --optimize-autoloader
|
||||
cd $final_path && php artisan key:generate --force
|
||||
cd $final_path && php artisan p:environment:setup --author=$email --url=https://$domain --timezone=America/New_York --cache=redis --session=database --queue=redis --disable-settings-ui --redis-host=127.0.0.1 --redis-pass= --redis-port=6379
|
||||
cd $final_path && php artisan p:environment:database --host=127.0.0.1 --port=3306 --database=$db_name --username=$db_name --password=$db_pwd
|
||||
cd $final_path && php artisan p:user:make
|
||||
cd $final_path && php artisan migrate --seed
|
||||
cd $final_path && chown -R www-data:www-data *
|
||||
)
|
||||
#==============================================
|
||||
# Install Pterodactyl
|
||||
#==============================================
|
||||
|
||||
cp -a ../conf/pteroq.service /etc/systemd/system/pteroq.service
|
||||
chmod -R 755 storage/* bootstrap/cache
|
||||
composer install --no-progress
|
||||
php artisan key:generate --force
|
||||
php artisan migrate
|
||||
php artisan db:seed
|
||||
php artisan p:user:make --name-first $admin --name-last $admin --username $admin --email $email --password $password --admin 1
|
||||
php artisan p:environment:setup --author=$email --url=https://$domain --timezone=America/New_York --cache=redis --session=database --queue=redis --disable-settings-ui --redis-host=127.0.0.1 --redis-pass= --redis-port=6379
|
||||
|
||||
#=================================================
|
||||
# SETUP SYSTEMD
|
||||
#=================================================
|
||||
|
||||
ynh_add_systemd_config
|
||||
systemctl enable $app.service
|
||||
|
||||
#=================================================
|
||||
# ADVERTISE SERVICE IN ADMIN PANEL
|
||||
#=================================================
|
||||
|
||||
touch /var/log/$app/$app-prod.log
|
||||
yunohost service add $app --log "/var/log/$app/$app-prod.log"
|
||||
|
||||
#==============================================
|
||||
# Cron
|
||||
#==============================================
|
||||
|
||||
#Cron
|
||||
crontab -l > pterodactyl
|
||||
echo "* * * * * php /var/www/pterodactyl/artisan schedule:run" >> pterodactyl
|
||||
crontab pterodactyl
|
||||
#crontab -l | { cat; echo "* * * * * php /var/www/pterodactyl/artisan schedule:run"; } | crontab -
|
||||
|
||||
#=================================================
|
||||
# STORE THE CONFIG FILE CHECKSUM
|
||||
#=================================================
|
||||
|
||||
### `ynh_store_file_checksum` is used to store the checksum of a file.
|
||||
### That way, during the upgrade script, by using `ynh_backup_if_checksum_is_different`,
|
||||
### you can make a backup of this file before modifying it again if the admin had modified it.
|
||||
|
||||
# Calculate and store the config file checksum into the app settings
|
||||
ynh_store_file_checksum "$final_path/.env"
|
||||
|
||||
|
||||
#=================================================
|
||||
# GENERIC FINALIZATION
|
||||
#=================================================
|
||||
# SECURE FILES AND DIRECTORIES
|
||||
#=================================================
|
||||
|
||||
### For security reason, any app should set the permissions to root: before anything else.
|
||||
### Then, if write authorization is needed, any access should be given only to directories
|
||||
### that really need such authorization.
|
||||
|
||||
# Set permissions to app files
|
||||
chown -R $app: $final_path
|
||||
|
||||
|
|
@ -221,19 +206,15 @@ chown -R $app: $final_path
|
|||
# SETUP SSOWAT
|
||||
#=================================================
|
||||
|
||||
# If app is public, add url to SSOWat conf as skipped_uris
|
||||
if [ $is_public -eq 1 ]; then
|
||||
# unprotected_uris allows SSO credentials to be passed anyway.
|
||||
ynh_app_setting_set "$app" unprotected_uris "/"
|
||||
# Make app public if necessary
|
||||
if [ $is_public -eq 1 ]
|
||||
then
|
||||
# unprotected_uris allows SSO credentials to be passed anyway.
|
||||
ynh_app_setting_set $app unprotected_uris "/"
|
||||
fi
|
||||
|
||||
# Reload services
|
||||
systemctl reload php7.2-fpm
|
||||
#=================================================
|
||||
# RELOAD NGINX
|
||||
#=================================================
|
||||
|
||||
systemctl reload nginx
|
||||
sudo systemctl enable --now pteroq.service
|
||||
# Set default php to php5 or php7.0
|
||||
if [ "$(lsb_release --codename --short)" == "jessie" ]; then
|
||||
update-alternatives --set php /usr/bin/php5
|
||||
else
|
||||
update-alternatives --set php /usr/bin/php7.0
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -1,287 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
#=================================================
|
||||
# GENERIC START
|
||||
#=================================================
|
||||
# IMPORT GENERIC HELPERS
|
||||
#=================================================
|
||||
|
||||
source _common.sh
|
||||
source /usr/share/yunohost/helpers
|
||||
|
||||
#=================================================
|
||||
# MANAGE SCRIPT FAILURE
|
||||
#=================================================
|
||||
|
||||
ynh_clean_setup () {
|
||||
### Remove this function if there's nothing to clean before calling the remove script.
|
||||
true
|
||||
}
|
||||
# Exit if an error occurs during the execution of the script
|
||||
ynh_abort_if_errors
|
||||
|
||||
#=================================================
|
||||
# RETRIEVE ARGUMENTS FROM THE MANIFEST
|
||||
#=================================================
|
||||
|
||||
# Retrieve arguments
|
||||
domain=$YNH_APP_ARG_DOMAIN
|
||||
path_url=$YNH_APP_ARG_PATH
|
||||
is_public=$YNH_APP_ARG_IS_PUBLIC
|
||||
|
||||
### If it's a multi-instance app, meaning it can be installed several times independently
|
||||
### The id of the app as stated in the manifest is available as $YNH_APP_ID
|
||||
### The instance number is available as $YNH_APP_INSTANCE_NUMBER (equals "1", "2", ...)
|
||||
### The app instance name is available as $YNH_APP_INSTANCE_NAME
|
||||
### - the first time the app is installed, YNH_APP_INSTANCE_NAME = ynhexample
|
||||
### - the second time the app is installed, YNH_APP_INSTANCE_NAME = ynhexample__2
|
||||
### - ynhexample__{N} for the subsequent installations, with N=3,4, ...
|
||||
### The app instance name is probably what interests you most, since this is
|
||||
### guaranteed to be unique. This is a good unique identifier to define installation path,
|
||||
### db names, ...
|
||||
app=$YNH_APP_INSTANCE_NAME
|
||||
|
||||
#=================================================
|
||||
# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
|
||||
#=================================================
|
||||
|
||||
### If the app uses nginx as web server (written in HTML/PHP in most cases), the final path should be "/var/www/$app".
|
||||
### If the app provides an internal web server (or uses another application server such as uwsgi), the final path should be "/opt/yunohost/$app"
|
||||
final_path=/var/www/$app
|
||||
test ! -e "$final_path" || ynh_die "This path already contains a folder"
|
||||
|
||||
# Normalize the url path syntax
|
||||
path_url=$(ynh_normalize_url_path $path_url)
|
||||
|
||||
# Check web path availability
|
||||
ynh_webpath_available $domain $path_url
|
||||
# Register (book) web path
|
||||
ynh_webpath_register $app $domain $path_url
|
||||
|
||||
#=================================================
|
||||
# STORE SETTINGS FROM MANIFEST
|
||||
#=================================================
|
||||
|
||||
ynh_app_setting_set $app domain $domain
|
||||
ynh_app_setting_set $app path $path_url
|
||||
ynh_app_setting_set $app is_public $is_public
|
||||
|
||||
#=================================================
|
||||
# FIND AND OPEN A PORT
|
||||
#=================================================
|
||||
|
||||
### Use these lines if you have to open a port for the application
|
||||
### `ynh_find_port` will find the first available port starting from the given port.
|
||||
### If you're not using these lines:
|
||||
### - Remove the section "CLOSE A PORT" in the remove script
|
||||
|
||||
# Find a free port
|
||||
port=$(ynh_find_port 8096)
|
||||
# Open this port
|
||||
yunohost firewall allow --no-upnp TCP $port 2>&1
|
||||
ynh_app_setting_set $app port $port
|
||||
|
||||
#==============================================
|
||||
# INSTALL DEPS
|
||||
#==============================================
|
||||
## Install MariaDB 10.1
|
||||
ynh_package_install software-properties-common dirmngr mariadb-common mariadb-server mariadb-client
|
||||
|
||||
## Start mariadb
|
||||
systemctl start mariadb
|
||||
systemctl enable mariadb
|
||||
|
||||
## Install the PHP 7.2 repo for debian
|
||||
#ynh_package_install ca-certificates apt-transport-https
|
||||
#wget -q https://packages.sury.org/php/apt.gpg -O- | apt-key add -
|
||||
#echo "deb https://packages.sury.org/php/ stretch main" | tee /etc/apt/sources.list.d/php.list
|
||||
|
||||
## Get apt updates
|
||||
ynh_package_update
|
||||
|
||||
ynh_install_php7
|
||||
|
||||
## Install PHP 7.2
|
||||
#ynh_package_install php7.2 php7.2-cli php7.2-gd php7.2-mysql php7.2-pdo php7.2-mbstring php7.2-tokenizer php7.2-bcmath php7.2-xml php7.2-fpm php7.2-curl php7.2-zip
|
||||
|
||||
## Start php7
|
||||
#systemctl enable php7.2-fpm
|
||||
#systemctl start php7.2-fpm
|
||||
|
||||
#=================================================
|
||||
# CREATE A MYSQL DATABASE
|
||||
#=================================================
|
||||
# If your app uses a MySQL database, you can use these lines to bootstrap
|
||||
# a database, an associated user and save the password in app settings
|
||||
|
||||
db_name=$(ynh_sanitize_dbid $app)
|
||||
ynh_app_setting_set $app db_name $db_name
|
||||
ynh_mysql_setup_db $db_name $db_name
|
||||
|
||||
#=================================================
|
||||
# DOWNLOAD, CHECK AND UNPACK SOURCE
|
||||
#=================================================
|
||||
|
||||
ynh_app_setting_set $app final_path $final_path
|
||||
# Download, check integrity, uncompress and patch the source from app.src
|
||||
ynh_setup_source "$final_path"
|
||||
|
||||
#=================================================
|
||||
# NGINX CONFIGURATION
|
||||
#=================================================
|
||||
|
||||
# Create a dedicated nginx config
|
||||
ynh_add_nginx_config
|
||||
|
||||
#=================================================
|
||||
# CREATE DEDICATED USER
|
||||
#=================================================
|
||||
|
||||
# Create a system user
|
||||
ynh_system_user_create $app
|
||||
|
||||
|
||||
#=================================================
|
||||
# PHP-FPM 7.2 CONFIGURATION
|
||||
#=================================================
|
||||
|
||||
# Create a dedicated php-fpm7.1 config
|
||||
ynh_add_fpm7.2_config
|
||||
|
||||
#=================================================
|
||||
# CREATE A MYSQL DATABASE
|
||||
#=================================================
|
||||
|
||||
### Use these lines if you need a database for the application.
|
||||
### `ynh_mysql_setup_db` will create a database, an associated user and a ramdom password.
|
||||
### The password will be stored as 'mysqlpwd' into the app settings,
|
||||
### and will be available as $db_pwd
|
||||
### If you're not using these lines:
|
||||
### - Remove the section "BACKUP THE MYSQL DATABASE" in the backup script
|
||||
### - Remove also the section "REMOVE THE MYSQL DATABASE" in the remove script
|
||||
### - As well as the section "RESTORE THE MYSQL DATABASE" in the restore script
|
||||
|
||||
#db_name=$(ynh_sanitize_dbid $app)
|
||||
#ynh_app_setting_set $app db_name $db_name
|
||||
#ynh_mysql_setup_db $db_name $db_name
|
||||
#ynh_mysql_execute_as_root <<< "GRANT ALL PRIVILEGES ON $db_name.* TO '$app'@'localhost' WITH GRANT OPTION;FLUSH PRIVILEGES;"
|
||||
|
||||
#db_user=$app
|
||||
#db_name=$app
|
||||
#db_pass=$(ynh_string_random 20)
|
||||
#ynh_app_setting_set $app db_pass $db_pass
|
||||
|
||||
db_name=$(ynh_sanitize_dbid $app)
|
||||
ynh_app_setting_set $app db_name $db_name
|
||||
ynh_mysql_setup_db $db_name $db_name
|
||||
|
||||
#=================================================
|
||||
# SPECIFIC SETUP
|
||||
#=================================================
|
||||
|
||||
# create a user
|
||||
email=$(ynh_user_get_info $admin 'mail')
|
||||
|
||||
# setup application config
|
||||
cp -a ../conf/.env.example $final_path/.env
|
||||
|
||||
#=================================================
|
||||
# MODIFY A CONFIG FILE
|
||||
#=================================================
|
||||
|
||||
#ynh_replace_string "random_key" "$random_key" "$final_path/.env"
|
||||
ynh_replace_string "yunouser" "$db_name" "$final_path/.env"
|
||||
ynh_replace_string "yunopass" "$db_pwd" "$final_path/.env"
|
||||
ynh_replace_string "yunobase" "$db_name" "$final_path/.env"
|
||||
ynh_replace_string "yunomail" "$email" "$final_path/.env"
|
||||
ynh_replace_string "yunodomain" "$domain" "$final_path/.env"
|
||||
|
||||
init_composer $final_path
|
||||
( cd $final_path && sudo /usr/bin/php7.2 artisan config:clear )
|
||||
|
||||
db_name=$(ynh_sanitize_dbid $app)
|
||||
|
||||
# setup application config
|
||||
(
|
||||
cd $final_path && sudo /usr/bin/php7.2 artisan -q :refresh --seed --force
|
||||
cd $final_path && sudo /usr/bin/php7.2 artisan passport:install --force
|
||||
)
|
||||
|
||||
# Main config File
|
||||
#ynh_replace_string "__DB_USER__" "$db_user" "../conf/.env.example"
|
||||
#ynh_replace_string "__DB_NAME__" "$db_name" "../conf/.env.example"
|
||||
#ynh_replace_string "__DB_PASS__" "$db_pass" "../conf/.env.example"
|
||||
#cp -a ../conf/.env.example $final_path/.env
|
||||
#cp -a ../conf/pteroq.service /etc/systemd/system/pteroq.service
|
||||
|
||||
#==============================================
|
||||
# INSTALL Composer
|
||||
#==============================================
|
||||
|
||||
#sudo -u "admin" "curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer"
|
||||
|
||||
#php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
|
||||
#php -r "if (hash_file('sha384', 'composer-setup.php') === '93b54496392c062774670ac18b134c3b3a95e5a5e5c8f1a9f115f203b75bf9a129d5daa8ba6a13e2cc8a1da0806388a8') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
|
||||
#php composer-setup.php --install-dir=/usr/bin --filename=composer
|
||||
#php -r "unlink('composer-setup.php');"
|
||||
|
||||
#==============================================
|
||||
# INSTALL Pterodactyl
|
||||
#==============================================
|
||||
|
||||
cd $final_path
|
||||
chmod -R 755 storage/* bootstrap/cache/
|
||||
composer install --no-dev --optimize-autoloader
|
||||
php artisan key:generate --force
|
||||
php artisan p:environment:setup --author=pterodactyl@$domain --url=https://$domain$path_url --timezone=America/New_York --cache=redis --session=database --queue=redis --disable-settings-ui --redis-host=127.0.0.1 --redis-pass= --redis-port=6379
|
||||
php artisan p:environment:database --host=127.0.0.1 --port=3306 --database=$db_name --username=$db_user --password=$db_pass
|
||||
php artisan p:user:make --email=pterodactyl@$domain --admin=1
|
||||
php artisan migrate --seed
|
||||
php artisan p:user:make
|
||||
chown -R www-data:www-data *
|
||||
|
||||
#Cron
|
||||
crontab -l > pterodactyl
|
||||
echo "* * * * * php /var/www/pterodactyl/artisan schedule:run" >> pterodactyl
|
||||
crontab pterodactyl
|
||||
#crontab -l | { cat; echo "* * * * * php /var/www/pterodactyl/artisan schedule:run"; } | crontab -
|
||||
|
||||
#=================================================
|
||||
# STORE THE CONFIG FILE CHECKSUM
|
||||
#=================================================
|
||||
|
||||
### `ynh_store_file_checksum` is used to store the checksum of a file.
|
||||
### That way, during the upgrade script, by using `ynh_backup_if_checksum_is_different`,
|
||||
### you can make a backup of this file before modifying it again if the admin had modified it.
|
||||
|
||||
# Calculate and store the config file checksum into the app settings
|
||||
ynh_store_file_checksum "$final_path/.env"
|
||||
|
||||
|
||||
#=================================================
|
||||
# GENERIC FINALIZATION
|
||||
#=================================================
|
||||
# SECURE FILES AND DIRECTORIES
|
||||
#=================================================
|
||||
|
||||
### For security reason, any app should set the permissions to root: before anything else.
|
||||
### Then, if write authorization is needed, any access should be given only to directories
|
||||
### that really need such authorization.
|
||||
|
||||
# Set permissions to app files
|
||||
chown -R $app: $final_path
|
||||
|
||||
#=================================================
|
||||
# SETUP SSOWAT
|
||||
#=================================================
|
||||
|
||||
# If app is public, add url to SSOWat conf as skipped_uris
|
||||
if [ $is_public -eq 1 ]; then
|
||||
# unprotected_uris allows SSO credentials to be passed anyway.
|
||||
ynh_app_setting_set "$app" unprotected_uris "/"
|
||||
fi
|
||||
|
||||
# Reload services
|
||||
systemctl reload php7.2-fpm
|
||||
systemctl reload nginx
|
||||
sudo systemctl enable --now pteroq.service
|
||||
Loading…
Reference in a new issue